From 1bf2638c03bfe91edfd77e409b21077b3287ebc5 Mon Sep 17 00:00:00 2001 From: Mayur Kale Date: Mon, 26 Oct 2020 14:25:55 -0700 Subject: [PATCH 01/12] [Tagging Feature] add support for tagging feature --- .../cloud/spanner/AbstractReadContext.java | 16 +- .../google/cloud/spanner/CommitResponse.java | 4 + .../google/cloud/spanner/DatabaseClient.java | 3 +- .../com/google/cloud/spanner/Options.java | 52 +- .../spanner/PartitionedDmlTransaction.java | 4 +- .../com/google/cloud/spanner/SessionImpl.java | 4 + .../com/google/cloud/spanner/SessionPool.java | 36 +- .../cloud/spanner/TransactionContext.java | 28 +- .../cloud/spanner/TransactionRunnerImpl.java | 3 + .../spanner/AbstractReadContextTest.java | 14 + .../cloud/spanner/DatabaseClientImplTest.java | 10 + .../com/google/cloud/spanner/OptionsTest.java | 82 +- .../PartitionedDmlTransactionTest.java | 28 + .../google/cloud/spanner/SessionImplTest.java | 26 + .../v1/BatchCreateSessionsRequest.java | 289 ++-- .../BatchCreateSessionsRequestOrBuilder.java | 6 +- .../v1/BatchCreateSessionsResponse.java | 266 ++-- .../BatchCreateSessionsResponseOrBuilder.java | 8 +- .../spanner/v1/BeginTransactionRequest.java | 110 +- .../v1/BeginTransactionRequestOrBuilder.java | 4 +- .../com/google/spanner/v1/CommitRequest.java | 190 +-- .../spanner/v1/CommitRequestOrBuilder.java | 17 +- .../com/google/spanner/v1/CommitResponse.java | 120 +- .../spanner/v1/CreateSessionRequest.java | 276 ++-- .../v1/CreateSessionRequestOrBuilder.java | 6 +- .../spanner/v1/DeleteSessionRequest.java | 222 ++-- .../v1/DeleteSessionRequestOrBuilder.java | 2 +- .../spanner/v1/ExecuteBatchDmlRequest.java | 278 ++-- .../v1/ExecuteBatchDmlRequestOrBuilder.java | 15 +- .../spanner/v1/ExecuteBatchDmlResponse.java | 267 ++-- .../v1/ExecuteBatchDmlResponseOrBuilder.java | 8 +- .../google/spanner/v1/ExecuteSqlRequest.java | 322 ++--- .../v1/ExecuteSqlRequestOrBuilder.java | 25 +- .../google/spanner/v1/GetSessionRequest.java | 222 ++-- .../v1/GetSessionRequestOrBuilder.java | 2 +- .../java/com/google/spanner/v1/KeyRange.java | 239 ++-- .../google/spanner/v1/KeyRangeOrBuilder.java | 4 +- .../java/com/google/spanner/v1/KeySet.java | 266 ++-- .../google/spanner/v1/KeySetOrBuilder.java | 8 +- .../java/com/google/spanner/v1/KeysProto.java | 6 +- .../spanner/v1/ListSessionsRequest.java | 312 ++--- .../v1/ListSessionsRequestOrBuilder.java | 6 +- .../spanner/v1/ListSessionsResponse.java | 305 ++--- .../v1/ListSessionsResponseOrBuilder.java | 10 +- .../java/com/google/spanner/v1/Mutation.java | 1181 +++++++---------- .../google/spanner/v1/MutationOrBuilder.java | 22 +- .../com/google/spanner/v1/MutationProto.java | 12 +- .../google/spanner/v1/PartialResultSet.java | 313 ++--- .../spanner/v1/PartialResultSetOrBuilder.java | 8 +- .../java/com/google/spanner/v1/Partition.java | 178 ++- .../google/spanner/v1/PartitionOptions.java | 185 ++- .../spanner/v1/PartitionQueryRequest.java | 527 ++++---- .../v1/PartitionQueryRequestOrBuilder.java | 25 +- .../spanner/v1/PartitionReadRequest.java | 492 +++---- .../v1/PartitionReadRequestOrBuilder.java | 22 +- .../google/spanner/v1/PartitionResponse.java | 322 ++--- .../v1/PartitionResponseOrBuilder.java | 12 +- .../java/com/google/spanner/v1/PlanNode.java | 1038 +++++++-------- .../google/spanner/v1/PlanNodeOrBuilder.java | 17 +- .../java/com/google/spanner/v1/QueryPlan.java | 255 ++-- .../google/spanner/v1/QueryPlanOrBuilder.java | 8 +- .../com/google/spanner/v1/QueryPlanProto.java | 12 +- .../com/google/spanner/v1/ReadRequest.java | 208 +-- .../spanner/v1/ReadRequestOrBuilder.java | 18 +- .../com/google/spanner/v1/RequestOptions.java | 2 +- .../java/com/google/spanner/v1/ResultSet.java | 302 ++--- .../google/spanner/v1/ResultSetMetadata.java | 291 ++-- .../v1/ResultSetMetadataOrBuilder.java | 8 +- .../google/spanner/v1/ResultSetOrBuilder.java | 8 +- .../com/google/spanner/v1/ResultSetProto.java | 22 +- .../com/google/spanner/v1/ResultSetStats.java | 274 ++-- .../spanner/v1/ResultSetStatsOrBuilder.java | 6 +- .../google/spanner/v1/RollbackRequest.java | 223 ++-- .../spanner/v1/RollbackRequestOrBuilder.java | 2 +- .../java/com/google/spanner/v1/Session.java | 338 +++-- .../google/spanner/v1/SessionOrBuilder.java | 14 +- .../com/google/spanner/v1/SpannerProto.java | 492 +++---- .../com/google/spanner/v1/StructType.java | 542 ++++---- .../spanner/v1/StructTypeOrBuilder.java | 9 +- .../com/google/spanner/v1/Transaction.java | 185 ++- .../google/spanner/v1/TransactionOptions.java | 1096 +++++++-------- .../v1/TransactionOptionsOrBuilder.java | 14 +- .../google/spanner/v1/TransactionProto.java | 14 +- .../spanner/v1/TransactionSelector.java | 359 +++-- .../v1/TransactionSelectorOrBuilder.java | 10 +- .../main/java/com/google/spanner/v1/Type.java | 317 ++--- .../java/com/google/spanner/v1/TypeCode.java | 12 +- .../com/google/spanner/v1/TypeOrBuilder.java | 10 +- .../java/com/google/spanner/v1/TypeProto.java | 8 +- 89 files changed, 6278 insertions(+), 7256 deletions(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java index 3b6f00480b..d6f78877ff 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java @@ -539,8 +539,8 @@ private ResultSet executeQueryInternal( *
  • Specific {@link QueryOptions} passed in for this query. *
  • Any value specified in a valid environment variable when the {@link SpannerOptions} * instance was created. - *
  • The default {@link SpannerOptions#getDefaultQueryOptions()} specified for the database - * where the query is executed. + *
  • The default {@link SpannerOptions#getDefaultQueryOptions(DatabaseId)} specified for the + * database where the query is executed. * */ @VisibleForTesting @@ -563,6 +563,12 @@ RequestOptions buildRequestOptions(Options options) { if (options.hasPriority()) { builder.setPriority(options.priority()); } + if (options.hasTag()) { + builder.setRequestTag(options.tag()); + } + if (getTransactionTag() != null) { + builder.setTransactionTag(getTransactionTag()); + } return builder.build(); } @@ -594,7 +600,7 @@ ExecuteSqlRequest.Builder getExecuteSqlRequestBuilder( } ExecuteBatchDmlRequest.Builder getExecuteBatchDmlRequestBuilder( - Iterable statements, Options options) { + Iterable statements, Options options, String txnTag) { ExecuteBatchDmlRequest.Builder builder = ExecuteBatchDmlRequest.newBuilder().setSession(session.getName()); int idx = 0; @@ -754,6 +760,10 @@ ResultSet readInternalWithOptions( if (partitionToken != null) { builder.setPartitionToken(partitionToken); } + if (readOptions.hasTag()) { + builder.setRequestOptions( + RequestOptions.newBuilder().setRequestTag(readOptions.tag()).build()); + } final int prefetchChunks = readOptions.hasPrefetchChunks() ? readOptions.prefetchChunks() : defaultPrefetchChunks; ResumableStreamIterator stream = diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/CommitResponse.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/CommitResponse.java index 3ebd8f5531..927cc36d6c 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/CommitResponse.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/CommitResponse.java @@ -25,6 +25,10 @@ public class CommitResponse { private final com.google.spanner.v1.CommitResponse proto; + static CommitResponse fromProto(com.google.spanner.v1.CommitResponse proto) { + return new CommitResponse(Timestamp.fromProto(proto.getCommitTimestamp())); + } + public CommitResponse(Timestamp commitTimestamp) { this.proto = com.google.spanner.v1.CommitResponse.newBuilder() diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java index 215d86c825..0f115534af 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java @@ -545,7 +545,8 @@ CommitResponse writeAtLeastOnceWithOptions( * execution strategy that provides different, and often better, scalability properties for large, * table-wide operations than DML in a {@link #readWriteTransaction()} transaction. Smaller scoped * statements, such as an OLTP workload, should prefer using {@link - * TransactionContext#executeUpdate(Statement)} with {@link #readWriteTransaction()}. + * TransactionContext#executeUpdate(Statement, UpdateOption...)} with {@link + * #readWriteTransaction()}. * *

    That said, Partitioned DML is not a drop-in replacement for standard DML used in {@link * #readWriteTransaction()}. diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java index 8435680eab..71f7b26970 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java @@ -44,13 +44,13 @@ private RpcPriority(Priority proto) { /** Marker interface to mark options applicable to both Read and Query operations */ public interface ReadAndQueryOption extends ReadOption, QueryOption {} - /** Marker interface to mark options applicable to read operation */ - public interface ReadOption {} - /** Marker interface to mark options applicable to Read, Query, Update and Write operations */ public interface ReadQueryUpdateTransactionOption extends ReadOption, QueryOption, UpdateOption, TransactionOption {} + /** Marker interface to mark options applicable to read operation */ + public interface ReadOption {} + /** Marker interface to mark options applicable to query operation. */ public interface QueryOption {} @@ -101,6 +101,14 @@ public static ReadQueryUpdateTransactionOption priority(RpcPriority priority) { return new PriorityOption(priority); } + /** + * Specifying this will cause the reads, queries, updates and writes operations statistics + * collection grouped by tag. + */ + public static ReadQueryUpdateTransactionOption tag(String name) { + return new TagOption(name); + } + /** * Specifying this will cause the list operations to fetch at most this many records in a page. */ @@ -194,6 +202,20 @@ void appendToOptions(Options options) { } } + static final class TagOption extends InternalOption implements ReadQueryUpdateTransactionOption { + private final String tag; + + TagOption(String tag) { + this.tag = tag; + } + + @Override + void appendToOptions(Options options) { + options.tag = tag; + } + } + + private boolean withCommitStats; private Long limit; private Integer prefetchChunks; @@ -202,6 +224,7 @@ void appendToOptions(Options options) { private String pageToken; private String filter; private RpcPriority priority; + private String tag; // Construction is via factory methods below. private Options() {} @@ -266,6 +289,14 @@ Priority priority() { return priority == null ? null : priority.proto; } + boolean hasTag() { + return tag != null; + } + + String tag() { + return tag; + } + @Override public String toString() { StringBuilder b = new StringBuilder(); @@ -290,6 +321,9 @@ public String toString() { if (priority != null) { b.append("priority: ").append(priority).append(' '); } + if (tag != null) { + b.append("tag: ").append(tag).append(' '); + } return b.toString(); } @@ -320,7 +354,8 @@ public boolean equals(Object o) { || hasPageSize() && that.hasPageSize() && Objects.equals(pageSize(), that.pageSize())) && Objects.equals(pageToken(), that.pageToken()) && Objects.equals(filter(), that.filter()) - && Objects.equals(priority(), that.priority()); + && Objects.equals(priority(), that.priority()) + && Objects.equals(tag(), that.tag()); } @Override @@ -350,6 +385,9 @@ public int hashCode() { if (priority != null) { result = 31 * result + priority.hashCode(); } + if (tag != null) { + result = 31 * result + tag.hashCode(); + } return result; } @@ -364,13 +402,13 @@ static Options fromReadOptions(ReadOption... options) { } static Options fromQueryOptions(QueryOption... options) { - Options readOptions = new Options(); + Options queryOptions = new Options(); for (QueryOption option : options) { if (option instanceof InternalOption) { - ((InternalOption) option).appendToOptions(readOptions); + ((InternalOption) option).appendToOptions(queryOptions); } } - return readOptions; + return queryOptions; } static Options fromUpdateOptions(UpdateOption... options) { diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDmlTransaction.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDmlTransaction.java index 697f3e6351..95ad15aa6c 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDmlTransaction.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDmlTransaction.java @@ -185,7 +185,9 @@ ExecuteSqlRequest newTransactionRequestFrom(final Statement statement, final Opt builder.setRequestOptions( RequestOptions.newBuilder().setPriority(options.priority()).build()); } - + if (options.hasTag()) { + builder.setRequestOptions(RequestOptions.newBuilder().setRequestTag(options.tag()).build()); + } return builder.build(); } diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java index d122310eb7..ef219d5510 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java @@ -176,6 +176,10 @@ public CommitResponse writeAtLeastOnceWithOptions( if (commitRequestOptions.hasPriority()) { requestBuilder.setRequestOptions( RequestOptions.newBuilder().setPriority(commitRequestOptions.priority()).build()); + Options opts = Options.fromTransactionOptions(transactionOptions); + if (opts.hasTag()) { + requestBuilder.setRequestOptions( + RequestOptions.newBuilder().setTransactionTag(opts.tag()).build()); } Span span = tracer.spanBuilder(SpannerImpl.COMMIT).startSpan(); try (Scope s = tracer.withSpan(span)) { 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 0d5f36b5c1..a342673c25 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 @@ -681,6 +681,15 @@ public Struct apply(SessionNotFoundException input) { } } + @Override + public long executeUpdate(Statement statement, UpdateOption... options) { + try { + return delegate.executeUpdate(statement, options); + } catch (SessionNotFoundException e) { + throw handler.handleSessionNotFound(e); + } + } + @Override public void buffer(Mutation mutation) { delegate.buffer(mutation); @@ -695,6 +704,15 @@ public Struct readRowUsingIndex(String table, String index, Key key, Iterable statements, UpdateOption... options) { + try { + return delegate.batchUpdate(statements, options); + } catch (SessionNotFoundException e) { + throw handler.handleSessionNotFound(e); + } + } + @Override public ApiFuture readRowUsingIndexAsync( String table, String index, Key key, Iterable columns) { @@ -717,15 +735,6 @@ public void buffer(Iterable mutations) { delegate.buffer(mutations); } - @Override - public long executeUpdate(Statement statement, UpdateOption... options) { - try { - return delegate.executeUpdate(statement, options); - } catch (SessionNotFoundException e) { - throw handler.handleSessionNotFound(e); - } - } - @Override public ApiFuture executeUpdateAsync(Statement statement, UpdateOption... options) { return ApiFutures.catching( @@ -740,15 +749,6 @@ public Long apply(SessionNotFoundException input) { MoreExecutors.directExecutor()); } - @Override - public long[] batchUpdate(Iterable statements, UpdateOption... options) { - try { - return delegate.batchUpdate(statements, options); - } catch (SessionNotFoundException e) { - throw handler.handleSessionNotFound(e); - } - } - @Override public ApiFuture batchUpdateAsync( Iterable statements, UpdateOption... options) { diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionContext.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionContext.java index 64c45b12c0..e940c25875 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionContext.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionContext.java @@ -106,13 +106,13 @@ public interface TransactionContext extends ReadContext { long executeUpdate(Statement statement, UpdateOption... options); /** - * Same as {@link #executeUpdate(Statement)}, but is guaranteed to be non-blocking. If multiple - * asynchronous update statements are submitted to the same read/write transaction, the statements - * are guaranteed to be submitted to Cloud Spanner in the order that they were submitted in the - * client. This does however not guarantee that an asynchronous update statement will see the - * results of all previously submitted statements, as the execution of the statements can be - * parallel. If you rely on the results of a previous statement, you should block until the result - * of that statement is known and has been returned to the client. + * Same as {@link #executeUpdate(Statement, UpdateOption...)}, but is guaranteed to be + * non-blocking. If multiple asynchronous update statements are submitted to the same read/write + * transaction, the statements are guaranteed to be submitted to Cloud Spanner in the order that + * they were submitted in the client. This does however not guarantee that an asynchronous update + * statement will see the results of all previously submitted statements, as the execution of the + * statements can be parallel. If you rely on the results of a previous statement, you should + * block until the result of that statement is known and has been returned to the client. */ ApiFuture executeUpdateAsync(Statement statement, UpdateOption... options); @@ -134,13 +134,13 @@ public interface TransactionContext extends ReadContext { long[] batchUpdate(Iterable statements, UpdateOption... options); /** - * Same as {@link #batchUpdate(Iterable)}, but is guaranteed to be non-blocking. If multiple - * asynchronous update statements are submitted to the same read/write transaction, the statements - * are guaranteed to be submitted to Cloud Spanner in the order that they were submitted in the - * client. This does however not guarantee that an asynchronous update statement will see the - * results of all previously submitted statements, as the execution of the statements can be - * parallel. If you rely on the results of a previous statement, you should block until the result - * of that statement is known and has been returned to the client. + * Same as {@link #batchUpdate(Iterable, UpdateOption...)}, but is guaranteed to be non-blocking. + * If multiple asynchronous update statements are submitted to the same read/write transaction, + * the statements are guaranteed to be submitted to Cloud Spanner in the order that they were + * submitted in the client. This does however not guarantee that an asynchronous update statement + * will see the results of all previously submitted statements, as the execution of the statements + * can be parallel. If you rely on the results of a previous statement, you should block until the + * result of that statement is known and has been returned to the client. */ ApiFuture batchUpdateAsync(Iterable statements, UpdateOption... options); } diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java index 860348adff..0fd9817b8c 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java @@ -352,6 +352,9 @@ public void run() { if (options.hasPriority()) { requestBuilder.setRequestOptions( RequestOptions.newBuilder().setPriority(options.priority()).build()); + if (options.hasTag()) { + requestBuilder.setRequestOptions( + RequestOptions.newBuilder().setTransactionTag(options.tag()).build()); } final CommitRequest commitRequest = requestBuilder.build(); span.addAnnotation("Starting Commit"); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java index 795a26fff7..3b2d04ffe6 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java @@ -162,4 +162,18 @@ public void testGetExecuteBatchDmlRequestBuilderWithPriority() { Options.fromQueryOptions(Options.priority(RpcPriority.LOW))); assertEquals(Priority.PRIORITY_LOW, request.getRequestOptions().getPriority()); } + + public void executeSqlRequestBuilderWithRequestOptions() { + ExecuteSqlRequest request = + context + .getExecuteSqlRequestBuilder( + Statement.newBuilder("SELECT FOO FROM BAR").build(), + QueryMode.NORMAL, + Options.fromUpdateOptions(Options.tag("tag-1"))) + .build(); + assertThat(request.getSql()).isEqualTo("SELECT FOO FROM BAR"); + assertThat(request.getRequestOptions().getRequestTag()).isEqualTo("tag-1"); + assertThat(request.getRequestOptions().getTransactionTag()).isEmpty(); + } + } } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java index 867d8fb242..138f34ddb8 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java @@ -271,6 +271,16 @@ public void testWriteAtLeastOnceWithOptions() { assertEquals(Priority.PRIORITY_LOW, commit.getRequestOptions().getPriority()); } + @Test + public void writeAtLeastOnceWithOptions() { + DatabaseClient client = + spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE)); + client.writeAtLeastOnceWithOptions( + Arrays.asList( + Mutation.newInsertBuilder("FOO").set("ID").to(1L).set("NAME").to("Bar").build()), + Options.tag("tag-1")); + } + @Test public void singleUse() { DatabaseClient client = diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java index 4ab08a4785..84653e898d 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java @@ -91,6 +91,7 @@ public void allOptionsAbsent() { assertThat(options.hasFilter()).isFalse(); assertThat(options.hasPageToken()).isFalse(); assertThat(options.hasPriority()).isFalse(); + assertThat(options.hasTag()).isFalse(); assertThat(options.toString()).isEqualTo(""); assertThat(options.equals(options)).isTrue(); assertThat(options.equals(null)).isFalse(); @@ -170,10 +171,13 @@ public void listEquality() { @Test public void readOptTest() { int limit = 3; - Options opts = Options.fromReadOptions(Options.limit(limit)); + String tag = "read"; + Options opts = Options.fromReadOptions(Options.limit(limit), Options.tag(tag)); - assertThat(opts.toString()).isEqualTo("limit: " + Integer.toString(limit) + " "); - assertThat(opts.hashCode()).isEqualTo(964); + assertThat(opts.toString()) + .isEqualTo("limit: " + Integer.toString(limit) + " " + "tag: " + tag + " "); + assertThat(opts.tag()).isEqualTo(tag); + assertThat(opts.hashCode()).isEqualTo(3526226); } @Test @@ -200,10 +204,13 @@ public void readEquality() { @Test public void queryOptTest() { int chunks = 3; - Options opts = Options.fromQueryOptions(Options.prefetchChunks(chunks)); - assertThat(opts.toString()).isEqualTo("prefetchChunks: " + Integer.toString(chunks) + " "); + String tag = "query"; + Options opts = Options.fromQueryOptions(Options.prefetchChunks(chunks), Options.tag(tag)); + assertThat(opts.toString()) + .isEqualTo("prefetchChunks: " + Integer.toString(chunks) + " " + "tag: " + tag + " "); assertThat(opts.prefetchChunks()).isEqualTo(chunks); - assertThat(opts.hashCode()).isEqualTo(964); + assertThat(opts.tag()).isEqualTo(tag); + assertThat(opts.hashCode()).isEqualTo(107974020); } @Test @@ -510,4 +517,67 @@ public void testTransactionOptionsPriorityEquality() { assertNotEquals(options2, options3); assertNotEquals(options2, options4); } + + public void updateOptTest() { + String tag = "tag-1"; + Options opts = Options.fromUpdateOptions(Options.tag(tag)); + + assertThat(opts.toString()).isEqualTo("tag: " + tag + " "); + assertThat(opts.hasTag()).isTrue(); + assertThat(opts.tag()).isEqualTo(tag); + assertThat(opts.hashCode()).isEqualTo(110119551); + } + + @Test + public void updateEquality() { + Options o1; + Options o2; + Options o3; + + o1 = Options.fromUpdateOptions(); + o2 = Options.fromUpdateOptions(); + assertThat(o1.equals(o2)).isTrue(); + + o2 = Options.fromUpdateOptions(Options.tag("tag-1")); + assertThat(o1.equals(o2)).isFalse(); + assertThat(o2.equals(o1)).isFalse(); + + o3 = Options.fromUpdateOptions(Options.tag("tag-1")); + assertThat(o2.equals(o3)).isTrue(); + + o3 = Options.fromUpdateOptions(Options.tag("tag-2")); + assertThat(o2.equals(o3)).isFalse(); + } + + @Test + public void transactionOptTest() { + String tag = "tag-1"; + Options opts = Options.fromTransactionOptions(Options.tag(tag)); + + assertThat(opts.toString()).isEqualTo("tag: " + tag + " "); + assertThat(opts.hasTag()).isTrue(); + assertThat(opts.tag()).isEqualTo(tag); + assertThat(opts.hashCode()).isEqualTo(110119551); + } + + @Test + public void transactionEquality() { + Options o1; + Options o2; + Options o3; + + o1 = Options.fromTransactionOptions(); + o2 = Options.fromTransactionOptions(); + assertThat(o1.equals(o2)).isTrue(); + + o2 = Options.fromTransactionOptions(Options.tag("tag-1")); + assertThat(o1.equals(o2)).isFalse(); + assertThat(o2.equals(o1)).isFalse(); + + o3 = Options.fromTransactionOptions(Options.tag("tag-1")); + assertThat(o2.equals(o3)).isTrue(); + + o3 = Options.fromTransactionOptions(Options.tag("tag-2")); + assertThat(o2.equals(o3)).isFalse(); + } } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java index 4048d4b37c..e18cf8de77 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java @@ -67,6 +67,7 @@ public class PartitionedDmlTransactionTest { private final ByteString txId = ByteString.copyFromUtf8("tx"); private final ByteString resumeToken = ByteString.copyFromUtf8("resume"); private final String sql = "UPDATE FOO SET BAR=1 WHERE TRUE"; + private final String tag = "tag-1"; private final ExecuteSqlRequest executeRequestWithoutResumeToken = ExecuteSqlRequest.newBuilder() .setQueryMode(QueryMode.NORMAL) @@ -76,6 +77,11 @@ public class PartitionedDmlTransactionTest { .build(); private final ExecuteSqlRequest executeRequestWithResumeToken = executeRequestWithoutResumeToken.toBuilder().setResumeToken(resumeToken).build(); + private final ExecuteSqlRequest executeRequestWithRequestOptions = + executeRequestWithoutResumeToken + .toBuilder() + .setRequestOptions(RequestOptions.newBuilder().setRequestTag(tag).build()) + .build(); @Before public void setup() { @@ -108,6 +114,28 @@ public void testExecuteStreamingPartitionedUpdate() { Mockito.eq(executeRequestWithoutResumeToken), anyMap(), any(Duration.class)); } + @Test + public void testExecuteStreamingPartitionedUpdateWithUpdateOptions() { + ResultSetStats stats = ResultSetStats.newBuilder().setRowCountLowerBound(1000L).build(); + PartialResultSet p1 = PartialResultSet.newBuilder().setResumeToken(resumeToken).build(); + PartialResultSet p2 = PartialResultSet.newBuilder().setStats(stats).build(); + ServerStream stream = mock(ServerStream.class); + when(stream.iterator()).thenReturn(ImmutableList.of(p1, p2).iterator()); + when(rpc.executeStreamingPartitionedDml( + Mockito.eq(executeRequestWithRequestOptions), anyMap(), any(Duration.class))) + .thenReturn(stream); + + long count = + tx.executeStreamingPartitionedUpdate( + Statement.of(sql), Duration.ofMinutes(10), Options.tag(tag)); + + assertThat(count).isEqualTo(1000L); + verify(rpc).beginTransaction(any(BeginTransactionRequest.class), anyMap()); + verify(rpc) + .executeStreamingPartitionedDml( + Mockito.eq(executeRequestWithRequestOptions), anyMap(), any(Duration.class)); + } + @Test public void testExecuteStreamingPartitionedUpdateAborted() { ResultSetStats stats = ResultSetStats.newBuilder().setRowCountLowerBound(1000L).build(); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java index 3827b2a280..acabba3d38 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java @@ -240,6 +240,32 @@ public void writeAtLeastOnce() throws ParseException { assertThat(request.getMutationsList()).containsExactly(mutation); } + @Test + public void writeAtLeastOnceWithOptions() throws ParseException { + String tag = "tag-1"; + String timestampString = "2015-10-01T10:54:20.021Z"; + ArgumentCaptor commit = ArgumentCaptor.forClass(CommitRequest.class); + CommitResponse response = + CommitResponse.newBuilder().setCommitTimestamp(Timestamps.parse(timestampString)).build(); + Mockito.when(rpc.commit(commit.capture(), Mockito.eq(options))).thenReturn(response); + session.writeAtLeastOnceWithOptions( + Arrays.asList(Mutation.newInsertBuilder("T").set("C").to("x").build()), Options.tag(tag)); + + CommitRequest request = commit.getValue(); + assertThat(request.getRequestOptions().getTransactionTag()).isEqualTo(tag); + com.google.spanner.v1.Mutation mutation = + com.google.spanner.v1.Mutation.newBuilder() + .setInsert( + Write.newBuilder() + .setTable("T") + .addColumns("C") + .addValues( + ListValue.newBuilder() + .addValues(com.google.protobuf.Value.newBuilder().setStringValue("x")))) + .build(); + assertThat(request.getMutationsList()).containsExactly(mutation); + } + private static long utcTimeSeconds(int year, int month, int day, int hour, int min, int secs) { GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC")); calendar.set(year, month, day, hour, min, secs); diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequest.java index cdca44bf67..00005feee3 100644 --- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequest.java +++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequest.java @@ -41,13 +41,13 @@ private BatchCreateSessionsRequest() { database_ = ""; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + protected Object newInstance(UnusedPrivateParameter unused) { return new BatchCreateSessionsRequest(); } - @java.lang.Override + @Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } @@ -58,7 +58,7 @@ private BatchCreateSessionsRequest( throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException(); } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -72,19 +72,18 @@ private BatchCreateSessionsRequest( break; case 10: { - java.lang.String s = input.readStringRequireUtf8(); + String s = input.readStringRequireUtf8(); database_ = s; break; } case 18: { - com.google.spanner.v1.Session.Builder subBuilder = null; + Session.Builder subBuilder = null; if (sessionTemplate_ != null) { subBuilder = sessionTemplate_.toBuilder(); } - sessionTemplate_ = - input.readMessage(com.google.spanner.v1.Session.parser(), extensionRegistry); + sessionTemplate_ = input.readMessage(Session.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(sessionTemplate_); sessionTemplate_ = subBuilder.buildPartial(); @@ -117,22 +116,18 @@ private BatchCreateSessionsRequest( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.google.spanner.v1.SpannerProto - .internal_static_google_spanner_v1_BatchCreateSessionsRequest_descriptor; + return SpannerProto.internal_static_google_spanner_v1_BatchCreateSessionsRequest_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.google.spanner.v1.SpannerProto + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { + return SpannerProto .internal_static_google_spanner_v1_BatchCreateSessionsRequest_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.google.spanner.v1.BatchCreateSessionsRequest.class, - com.google.spanner.v1.BatchCreateSessionsRequest.Builder.class); + .ensureFieldAccessorsInitialized(BatchCreateSessionsRequest.class, Builder.class); } public static final int DATABASE_FIELD_NUMBER = 1; - private volatile java.lang.Object database_; + private volatile Object database_; /** * * @@ -146,14 +141,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The database. */ - @java.lang.Override - public java.lang.String getDatabase() { - java.lang.Object ref = database_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getDatabase() { + Object ref = database_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); database_ = s; return s; } @@ -171,12 +166,11 @@ public java.lang.String getDatabase() { * * @return The bytes for database. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getDatabaseBytes() { - java.lang.Object ref = database_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + Object ref = database_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref); database_ = b; return b; } else { @@ -185,7 +179,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() { } public static final int SESSION_TEMPLATE_FIELD_NUMBER = 2; - private com.google.spanner.v1.Session sessionTemplate_; + private Session sessionTemplate_; /** * * @@ -197,7 +191,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() { * * @return Whether the sessionTemplate field is set. */ - @java.lang.Override + @Override public boolean hasSessionTemplate() { return sessionTemplate_ != null; } @@ -212,11 +206,9 @@ public boolean hasSessionTemplate() { * * @return The sessionTemplate. */ - @java.lang.Override - public com.google.spanner.v1.Session getSessionTemplate() { - return sessionTemplate_ == null - ? com.google.spanner.v1.Session.getDefaultInstance() - : sessionTemplate_; + @Override + public Session getSessionTemplate() { + return sessionTemplate_ == null ? Session.getDefaultInstance() : sessionTemplate_; } /** * @@ -227,8 +219,8 @@ public com.google.spanner.v1.Session getSessionTemplate() { * * .google.spanner.v1.Session session_template = 2; */ - @java.lang.Override - public com.google.spanner.v1.SessionOrBuilder getSessionTemplateOrBuilder() { + @Override + public SessionOrBuilder getSessionTemplateOrBuilder() { return getSessionTemplate(); } @@ -249,14 +241,14 @@ public com.google.spanner.v1.SessionOrBuilder getSessionTemplateOrBuilder() { * * @return The sessionCount. */ - @java.lang.Override + @Override public int getSessionCount() { return sessionCount_; } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -266,7 +258,7 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getDatabaseBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, database_); @@ -280,7 +272,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io unknownFields.writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -300,16 +292,15 @@ public int getSerializedSize() { return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.google.spanner.v1.BatchCreateSessionsRequest)) { + if (!(obj instanceof BatchCreateSessionsRequest)) { return super.equals(obj); } - com.google.spanner.v1.BatchCreateSessionsRequest other = - (com.google.spanner.v1.BatchCreateSessionsRequest) obj; + BatchCreateSessionsRequest other = (BatchCreateSessionsRequest) obj; if (!getDatabase().equals(other.getDatabase())) return false; if (hasSessionTemplate() != other.hasSessionTemplate()) return false; @@ -321,7 +312,7 @@ public boolean equals(final java.lang.Object obj) { return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -341,71 +332,70 @@ public int hashCode() { return hash; } - public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom(java.nio.ByteBuffer data) + public static BatchCreateSessionsRequest parseFrom(java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom( + public static BatchCreateSessionsRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom( - com.google.protobuf.ByteString data) + public static BatchCreateSessionsRequest parseFrom(com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom( + public static BatchCreateSessionsRequest 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.spanner.v1.BatchCreateSessionsRequest parseFrom(byte[] data) + public static BatchCreateSessionsRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom( + public static BatchCreateSessionsRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static BatchCreateSessionsRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); } - public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom( + public static BatchCreateSessionsRequest 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.spanner.v1.BatchCreateSessionsRequest parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static BatchCreateSessionsRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); } - public static com.google.spanner.v1.BatchCreateSessionsRequest parseDelimitedFrom( + public static BatchCreateSessionsRequest 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.spanner.v1.BatchCreateSessionsRequest parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static BatchCreateSessionsRequest parseFrom(com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); } - public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom( + public static BatchCreateSessionsRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -413,7 +403,7 @@ public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom( PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } @@ -422,17 +412,17 @@ public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.google.spanner.v1.BatchCreateSessionsRequest prototype) { + public static Builder newBuilder(BatchCreateSessionsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override 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) { + @Override + protected Builder newBuilderForType(BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -448,20 +438,16 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:google.spanner.v1.BatchCreateSessionsRequest) - com.google.spanner.v1.BatchCreateSessionsRequestOrBuilder { + BatchCreateSessionsRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.google.spanner.v1.SpannerProto - .internal_static_google_spanner_v1_BatchCreateSessionsRequest_descriptor; + return SpannerProto.internal_static_google_spanner_v1_BatchCreateSessionsRequest_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.google.spanner.v1.SpannerProto + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { + return SpannerProto .internal_static_google_spanner_v1_BatchCreateSessionsRequest_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.google.spanner.v1.BatchCreateSessionsRequest.class, - com.google.spanner.v1.BatchCreateSessionsRequest.Builder.class); + .ensureFieldAccessorsInitialized(BatchCreateSessionsRequest.class, Builder.class); } // Construct using com.google.spanner.v1.BatchCreateSessionsRequest.newBuilder() @@ -469,7 +455,7 @@ private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -478,7 +464,7 @@ private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } - @java.lang.Override + @Override public Builder clear() { super.clear(); database_ = ""; @@ -494,30 +480,28 @@ public Builder clear() { return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.google.spanner.v1.SpannerProto - .internal_static_google_spanner_v1_BatchCreateSessionsRequest_descriptor; + return SpannerProto.internal_static_google_spanner_v1_BatchCreateSessionsRequest_descriptor; } - @java.lang.Override - public com.google.spanner.v1.BatchCreateSessionsRequest getDefaultInstanceForType() { - return com.google.spanner.v1.BatchCreateSessionsRequest.getDefaultInstance(); + @Override + public BatchCreateSessionsRequest getDefaultInstanceForType() { + return BatchCreateSessionsRequest.getDefaultInstance(); } - @java.lang.Override - public com.google.spanner.v1.BatchCreateSessionsRequest build() { - com.google.spanner.v1.BatchCreateSessionsRequest result = buildPartial(); + @Override + public BatchCreateSessionsRequest build() { + BatchCreateSessionsRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.google.spanner.v1.BatchCreateSessionsRequest buildPartial() { - com.google.spanner.v1.BatchCreateSessionsRequest result = - new com.google.spanner.v1.BatchCreateSessionsRequest(this); + @Override + public BatchCreateSessionsRequest buildPartial() { + BatchCreateSessionsRequest result = new BatchCreateSessionsRequest(this); result.database_ = database_; if (sessionTemplateBuilder_ == null) { result.sessionTemplate_ = sessionTemplate_; @@ -529,52 +513,50 @@ public com.google.spanner.v1.BatchCreateSessionsRequest buildPartial() { return result; } - @java.lang.Override + @Override public Builder clone() { return super.clone(); } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + @Override + public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.google.spanner.v1.BatchCreateSessionsRequest) { - return mergeFrom((com.google.spanner.v1.BatchCreateSessionsRequest) other); + if (other instanceof BatchCreateSessionsRequest) { + return mergeFrom((BatchCreateSessionsRequest) other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.google.spanner.v1.BatchCreateSessionsRequest other) { - if (other == com.google.spanner.v1.BatchCreateSessionsRequest.getDefaultInstance()) - return this; + public Builder mergeFrom(BatchCreateSessionsRequest other) { + if (other == BatchCreateSessionsRequest.getDefaultInstance()) return this; if (!other.getDatabase().isEmpty()) { database_ = other.database_; onChanged(); @@ -590,21 +572,21 @@ public Builder mergeFrom(com.google.spanner.v1.BatchCreateSessionsRequest other) return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.spanner.v1.BatchCreateSessionsRequest parsedMessage = null; + BatchCreateSessionsRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.spanner.v1.BatchCreateSessionsRequest) e.getUnfinishedMessage(); + parsedMessage = (BatchCreateSessionsRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -614,7 +596,7 @@ public Builder mergeFrom( return this; } - private java.lang.Object database_ = ""; + private Object database_ = ""; /** * * @@ -628,15 +610,15 @@ public Builder mergeFrom( * * @return The database. */ - public java.lang.String getDatabase() { - java.lang.Object ref = database_; - if (!(ref instanceof java.lang.String)) { + public String getDatabase() { + Object ref = database_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); database_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -653,10 +635,10 @@ public java.lang.String getDatabase() { * @return The bytes for database. */ public com.google.protobuf.ByteString getDatabaseBytes() { - java.lang.Object ref = database_; + Object ref = database_; if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8((String) ref); database_ = b; return b; } else { @@ -677,7 +659,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() { * @param value The database to set. * @return This builder for chaining. */ - public Builder setDatabase(java.lang.String value) { + public Builder setDatabase(String value) { if (value == null) { throw new NullPointerException(); } @@ -730,11 +712,8 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.spanner.v1.Session sessionTemplate_; - private com.google.protobuf.SingleFieldBuilderV3< - com.google.spanner.v1.Session, - com.google.spanner.v1.Session.Builder, - com.google.spanner.v1.SessionOrBuilder> + private Session sessionTemplate_; + private com.google.protobuf.SingleFieldBuilderV3 sessionTemplateBuilder_; /** * @@ -761,11 +740,9 @@ public boolean hasSessionTemplate() { * * @return The sessionTemplate. */ - public com.google.spanner.v1.Session getSessionTemplate() { + public Session getSessionTemplate() { if (sessionTemplateBuilder_ == null) { - return sessionTemplate_ == null - ? com.google.spanner.v1.Session.getDefaultInstance() - : sessionTemplate_; + return sessionTemplate_ == null ? Session.getDefaultInstance() : sessionTemplate_; } else { return sessionTemplateBuilder_.getMessage(); } @@ -779,7 +756,7 @@ public com.google.spanner.v1.Session getSessionTemplate() { * * .google.spanner.v1.Session session_template = 2; */ - public Builder setSessionTemplate(com.google.spanner.v1.Session value) { + public Builder setSessionTemplate(Session value) { if (sessionTemplateBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -801,7 +778,7 @@ public Builder setSessionTemplate(com.google.spanner.v1.Session value) { * * .google.spanner.v1.Session session_template = 2; */ - public Builder setSessionTemplate(com.google.spanner.v1.Session.Builder builderForValue) { + public Builder setSessionTemplate(Session.Builder builderForValue) { if (sessionTemplateBuilder_ == null) { sessionTemplate_ = builderForValue.build(); onChanged(); @@ -820,13 +797,10 @@ public Builder setSessionTemplate(com.google.spanner.v1.Session.Builder builderF * * .google.spanner.v1.Session session_template = 2; */ - public Builder mergeSessionTemplate(com.google.spanner.v1.Session value) { + public Builder mergeSessionTemplate(Session value) { if (sessionTemplateBuilder_ == null) { if (sessionTemplate_ != null) { - sessionTemplate_ = - com.google.spanner.v1.Session.newBuilder(sessionTemplate_) - .mergeFrom(value) - .buildPartial(); + sessionTemplate_ = Session.newBuilder(sessionTemplate_).mergeFrom(value).buildPartial(); } else { sessionTemplate_ = value; } @@ -866,7 +840,7 @@ public Builder clearSessionTemplate() { * * .google.spanner.v1.Session session_template = 2; */ - public com.google.spanner.v1.Session.Builder getSessionTemplateBuilder() { + public Session.Builder getSessionTemplateBuilder() { onChanged(); return getSessionTemplateFieldBuilder().getBuilder(); @@ -880,13 +854,11 @@ public com.google.spanner.v1.Session.Builder getSessionTemplateBuilder() { * * .google.spanner.v1.Session session_template = 2; */ - public com.google.spanner.v1.SessionOrBuilder getSessionTemplateOrBuilder() { + public SessionOrBuilder getSessionTemplateOrBuilder() { if (sessionTemplateBuilder_ != null) { return sessionTemplateBuilder_.getMessageOrBuilder(); } else { - return sessionTemplate_ == null - ? com.google.spanner.v1.Session.getDefaultInstance() - : sessionTemplate_; + return sessionTemplate_ == null ? Session.getDefaultInstance() : sessionTemplate_; } } /** @@ -898,17 +870,12 @@ public com.google.spanner.v1.SessionOrBuilder getSessionTemplateOrBuilder() { * * .google.spanner.v1.Session session_template = 2; */ - private com.google.protobuf.SingleFieldBuilderV3< - com.google.spanner.v1.Session, - com.google.spanner.v1.Session.Builder, - com.google.spanner.v1.SessionOrBuilder> + private com.google.protobuf.SingleFieldBuilderV3 getSessionTemplateFieldBuilder() { if (sessionTemplateBuilder_ == null) { sessionTemplateBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.google.spanner.v1.Session, - com.google.spanner.v1.Session.Builder, - com.google.spanner.v1.SessionOrBuilder>( + Session, Session.Builder, SessionOrBuilder>( getSessionTemplate(), getParentForChildren(), isClean()); sessionTemplate_ = null; } @@ -931,7 +898,7 @@ public com.google.spanner.v1.SessionOrBuilder getSessionTemplateOrBuilder() { * * @return The sessionCount. */ - @java.lang.Override + @Override public int getSessionCount() { return sessionCount_; } @@ -979,12 +946,12 @@ public Builder clearSessionCount() { return this; } - @java.lang.Override + @Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -994,19 +961,19 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:google.spanner.v1.BatchCreateSessionsRequest) - private static final com.google.spanner.v1.BatchCreateSessionsRequest DEFAULT_INSTANCE; + private static final BatchCreateSessionsRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.google.spanner.v1.BatchCreateSessionsRequest(); + DEFAULT_INSTANCE = new BatchCreateSessionsRequest(); } - public static com.google.spanner.v1.BatchCreateSessionsRequest getDefaultInstance() { + public static BatchCreateSessionsRequest getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public BatchCreateSessionsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1019,13 +986,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.google.spanner.v1.BatchCreateSessionsRequest getDefaultInstanceForType() { + @Override + public BatchCreateSessionsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequestOrBuilder.java index 3a4cd4d26a..0ebd6d8b7c 100644 --- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequestOrBuilder.java +++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequestOrBuilder.java @@ -36,7 +36,7 @@ public interface BatchCreateSessionsRequestOrBuilder * * @return The database. */ - java.lang.String getDatabase(); + String getDatabase(); /** * * @@ -75,7 +75,7 @@ public interface BatchCreateSessionsRequestOrBuilder * * @return The sessionTemplate. */ - com.google.spanner.v1.Session getSessionTemplate(); + Session getSessionTemplate(); /** * * @@ -85,7 +85,7 @@ public interface BatchCreateSessionsRequestOrBuilder * * .google.spanner.v1.Session session_template = 2; */ - com.google.spanner.v1.SessionOrBuilder getSessionTemplateOrBuilder(); + SessionOrBuilder getSessionTemplateOrBuilder(); /** * diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponse.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponse.java index 76704fd06e..7b4cc06412 100644 --- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponse.java +++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponse.java @@ -41,13 +41,13 @@ private BatchCreateSessionsResponse() { session_ = java.util.Collections.emptyList(); } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + protected Object newInstance(UnusedPrivateParameter unused) { return new BatchCreateSessionsResponse(); } - @java.lang.Override + @Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } @@ -58,7 +58,7 @@ private BatchCreateSessionsResponse( throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException(); } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = @@ -74,11 +74,10 @@ private BatchCreateSessionsResponse( case 10: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - session_ = new java.util.ArrayList(); + session_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - session_.add( - input.readMessage(com.google.spanner.v1.Session.parser(), extensionRegistry)); + session_.add(input.readMessage(Session.parser(), extensionRegistry)); break; } default: @@ -104,22 +103,18 @@ private BatchCreateSessionsResponse( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.google.spanner.v1.SpannerProto - .internal_static_google_spanner_v1_BatchCreateSessionsResponse_descriptor; + return SpannerProto.internal_static_google_spanner_v1_BatchCreateSessionsResponse_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.google.spanner.v1.SpannerProto + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { + return SpannerProto .internal_static_google_spanner_v1_BatchCreateSessionsResponse_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.google.spanner.v1.BatchCreateSessionsResponse.class, - com.google.spanner.v1.BatchCreateSessionsResponse.Builder.class); + .ensureFieldAccessorsInitialized(BatchCreateSessionsResponse.class, Builder.class); } public static final int SESSION_FIELD_NUMBER = 1; - private java.util.List session_; + private java.util.List session_; /** * * @@ -129,8 +124,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * repeated .google.spanner.v1.Session session = 1; */ - @java.lang.Override - public java.util.List getSessionList() { + @Override + public java.util.List getSessionList() { return session_; } /** @@ -142,9 +137,8 @@ public java.util.List getSessionList() { * * repeated .google.spanner.v1.Session session = 1; */ - @java.lang.Override - public java.util.List - getSessionOrBuilderList() { + @Override + public java.util.List getSessionOrBuilderList() { return session_; } /** @@ -156,7 +150,7 @@ public java.util.List getSessionList() { * * repeated .google.spanner.v1.Session session = 1; */ - @java.lang.Override + @Override public int getSessionCount() { return session_.size(); } @@ -169,8 +163,8 @@ public int getSessionCount() { * * repeated .google.spanner.v1.Session session = 1; */ - @java.lang.Override - public com.google.spanner.v1.Session getSession(int index) { + @Override + public Session getSession(int index) { return session_.get(index); } /** @@ -182,14 +176,14 @@ public com.google.spanner.v1.Session getSession(int index) { * * repeated .google.spanner.v1.Session session = 1; */ - @java.lang.Override - public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder(int index) { + @Override + public SessionOrBuilder getSessionOrBuilder(int index) { return session_.get(index); } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -199,7 +193,7 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < session_.size(); i++) { output.writeMessage(1, session_.get(i)); @@ -207,7 +201,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io unknownFields.writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -221,23 +215,22 @@ public int getSerializedSize() { return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.google.spanner.v1.BatchCreateSessionsResponse)) { + if (!(obj instanceof BatchCreateSessionsResponse)) { return super.equals(obj); } - com.google.spanner.v1.BatchCreateSessionsResponse other = - (com.google.spanner.v1.BatchCreateSessionsResponse) obj; + BatchCreateSessionsResponse other = (BatchCreateSessionsResponse) obj; if (!getSessionList().equals(other.getSessionList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -253,71 +246,70 @@ public int hashCode() { return hash; } - public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom( - java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { + public static BatchCreateSessionsResponse parseFrom(java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom( + public static BatchCreateSessionsResponse parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom( - com.google.protobuf.ByteString data) + public static BatchCreateSessionsResponse parseFrom(com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom( + public static BatchCreateSessionsResponse 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.spanner.v1.BatchCreateSessionsResponse parseFrom(byte[] data) + public static BatchCreateSessionsResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom( + public static BatchCreateSessionsResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static BatchCreateSessionsResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); } - public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom( + public static BatchCreateSessionsResponse 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.spanner.v1.BatchCreateSessionsResponse parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static BatchCreateSessionsResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); } - public static com.google.spanner.v1.BatchCreateSessionsResponse parseDelimitedFrom( + public static BatchCreateSessionsResponse 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.spanner.v1.BatchCreateSessionsResponse parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static BatchCreateSessionsResponse parseFrom(com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); } - public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom( + public static BatchCreateSessionsResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -325,7 +317,7 @@ public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom( PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } @@ -334,17 +326,17 @@ public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.google.spanner.v1.BatchCreateSessionsResponse prototype) { + public static Builder newBuilder(BatchCreateSessionsResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override 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) { + @Override + protected Builder newBuilderForType(BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -360,20 +352,16 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:google.spanner.v1.BatchCreateSessionsResponse) - com.google.spanner.v1.BatchCreateSessionsResponseOrBuilder { + BatchCreateSessionsResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.google.spanner.v1.SpannerProto - .internal_static_google_spanner_v1_BatchCreateSessionsResponse_descriptor; + return SpannerProto.internal_static_google_spanner_v1_BatchCreateSessionsResponse_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.google.spanner.v1.SpannerProto + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { + return SpannerProto .internal_static_google_spanner_v1_BatchCreateSessionsResponse_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.google.spanner.v1.BatchCreateSessionsResponse.class, - com.google.spanner.v1.BatchCreateSessionsResponse.Builder.class); + .ensureFieldAccessorsInitialized(BatchCreateSessionsResponse.class, Builder.class); } // Construct using com.google.spanner.v1.BatchCreateSessionsResponse.newBuilder() @@ -381,7 +369,7 @@ private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -392,7 +380,7 @@ private void maybeForceBuilderInitialization() { } } - @java.lang.Override + @Override public Builder clear() { super.clear(); if (sessionBuilder_ == null) { @@ -404,30 +392,28 @@ public Builder clear() { return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.google.spanner.v1.SpannerProto - .internal_static_google_spanner_v1_BatchCreateSessionsResponse_descriptor; + return SpannerProto.internal_static_google_spanner_v1_BatchCreateSessionsResponse_descriptor; } - @java.lang.Override - public com.google.spanner.v1.BatchCreateSessionsResponse getDefaultInstanceForType() { - return com.google.spanner.v1.BatchCreateSessionsResponse.getDefaultInstance(); + @Override + public BatchCreateSessionsResponse getDefaultInstanceForType() { + return BatchCreateSessionsResponse.getDefaultInstance(); } - @java.lang.Override - public com.google.spanner.v1.BatchCreateSessionsResponse build() { - com.google.spanner.v1.BatchCreateSessionsResponse result = buildPartial(); + @Override + public BatchCreateSessionsResponse build() { + BatchCreateSessionsResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.google.spanner.v1.BatchCreateSessionsResponse buildPartial() { - com.google.spanner.v1.BatchCreateSessionsResponse result = - new com.google.spanner.v1.BatchCreateSessionsResponse(this); + @Override + public BatchCreateSessionsResponse buildPartial() { + BatchCreateSessionsResponse result = new BatchCreateSessionsResponse(this); int from_bitField0_ = bitField0_; if (sessionBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { @@ -442,52 +428,50 @@ public com.google.spanner.v1.BatchCreateSessionsResponse buildPartial() { return result; } - @java.lang.Override + @Override public Builder clone() { return super.clone(); } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + @Override + public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.google.spanner.v1.BatchCreateSessionsResponse) { - return mergeFrom((com.google.spanner.v1.BatchCreateSessionsResponse) other); + if (other instanceof BatchCreateSessionsResponse) { + return mergeFrom((BatchCreateSessionsResponse) other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.google.spanner.v1.BatchCreateSessionsResponse other) { - if (other == com.google.spanner.v1.BatchCreateSessionsResponse.getDefaultInstance()) - return this; + public Builder mergeFrom(BatchCreateSessionsResponse other) { + if (other == BatchCreateSessionsResponse.getDefaultInstance()) return this; if (sessionBuilder_ == null) { if (!other.session_.isEmpty()) { if (session_.isEmpty()) { @@ -520,22 +504,21 @@ public Builder mergeFrom(com.google.spanner.v1.BatchCreateSessionsResponse other return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.spanner.v1.BatchCreateSessionsResponse parsedMessage = null; + BatchCreateSessionsResponse parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.spanner.v1.BatchCreateSessionsResponse) e.getUnfinishedMessage(); + parsedMessage = (BatchCreateSessionsResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -547,20 +530,16 @@ public Builder mergeFrom( private int bitField0_; - private java.util.List session_ = - java.util.Collections.emptyList(); + private java.util.List session_ = java.util.Collections.emptyList(); private void ensureSessionIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - session_ = new java.util.ArrayList(session_); + session_ = new java.util.ArrayList(session_); bitField0_ |= 0x00000001; } } - private com.google.protobuf.RepeatedFieldBuilderV3< - com.google.spanner.v1.Session, - com.google.spanner.v1.Session.Builder, - com.google.spanner.v1.SessionOrBuilder> + private com.google.protobuf.RepeatedFieldBuilderV3 sessionBuilder_; /** @@ -572,7 +551,7 @@ private void ensureSessionIsMutable() { * * repeated .google.spanner.v1.Session session = 1; */ - public java.util.List getSessionList() { + public java.util.List getSessionList() { if (sessionBuilder_ == null) { return java.util.Collections.unmodifiableList(session_); } else { @@ -604,7 +583,7 @@ public int getSessionCount() { * * repeated .google.spanner.v1.Session session = 1; */ - public com.google.spanner.v1.Session getSession(int index) { + public Session getSession(int index) { if (sessionBuilder_ == null) { return session_.get(index); } else { @@ -620,7 +599,7 @@ public com.google.spanner.v1.Session getSession(int index) { * * repeated .google.spanner.v1.Session session = 1; */ - public Builder setSession(int index, com.google.spanner.v1.Session value) { + public Builder setSession(int index, Session value) { if (sessionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -642,7 +621,7 @@ public Builder setSession(int index, com.google.spanner.v1.Session value) { * * repeated .google.spanner.v1.Session session = 1; */ - public Builder setSession(int index, com.google.spanner.v1.Session.Builder builderForValue) { + public Builder setSession(int index, Session.Builder builderForValue) { if (sessionBuilder_ == null) { ensureSessionIsMutable(); session_.set(index, builderForValue.build()); @@ -661,7 +640,7 @@ public Builder setSession(int index, com.google.spanner.v1.Session.Builder build * * repeated .google.spanner.v1.Session session = 1; */ - public Builder addSession(com.google.spanner.v1.Session value) { + public Builder addSession(Session value) { if (sessionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -683,7 +662,7 @@ public Builder addSession(com.google.spanner.v1.Session value) { * * repeated .google.spanner.v1.Session session = 1; */ - public Builder addSession(int index, com.google.spanner.v1.Session value) { + public Builder addSession(int index, Session value) { if (sessionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -705,7 +684,7 @@ public Builder addSession(int index, com.google.spanner.v1.Session value) { * * repeated .google.spanner.v1.Session session = 1; */ - public Builder addSession(com.google.spanner.v1.Session.Builder builderForValue) { + public Builder addSession(Session.Builder builderForValue) { if (sessionBuilder_ == null) { ensureSessionIsMutable(); session_.add(builderForValue.build()); @@ -724,7 +703,7 @@ public Builder addSession(com.google.spanner.v1.Session.Builder builderForValue) * * repeated .google.spanner.v1.Session session = 1; */ - public Builder addSession(int index, com.google.spanner.v1.Session.Builder builderForValue) { + public Builder addSession(int index, Session.Builder builderForValue) { if (sessionBuilder_ == null) { ensureSessionIsMutable(); session_.add(index, builderForValue.build()); @@ -743,8 +722,7 @@ public Builder addSession(int index, com.google.spanner.v1.Session.Builder build * * repeated .google.spanner.v1.Session session = 1; */ - public Builder addAllSession( - java.lang.Iterable values) { + public Builder addAllSession(Iterable values) { if (sessionBuilder_ == null) { ensureSessionIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll(values, session_); @@ -801,7 +779,7 @@ public Builder removeSession(int index) { * * repeated .google.spanner.v1.Session session = 1; */ - public com.google.spanner.v1.Session.Builder getSessionBuilder(int index) { + public Session.Builder getSessionBuilder(int index) { return getSessionFieldBuilder().getBuilder(index); } /** @@ -813,7 +791,7 @@ public com.google.spanner.v1.Session.Builder getSessionBuilder(int index) { * * repeated .google.spanner.v1.Session session = 1; */ - public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder(int index) { + public SessionOrBuilder getSessionOrBuilder(int index) { if (sessionBuilder_ == null) { return session_.get(index); } else { @@ -829,8 +807,7 @@ public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder(int index) { * * repeated .google.spanner.v1.Session session = 1; */ - public java.util.List - getSessionOrBuilderList() { + public java.util.List getSessionOrBuilderList() { if (sessionBuilder_ != null) { return sessionBuilder_.getMessageOrBuilderList(); } else { @@ -846,9 +823,8 @@ public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder(int index) { * * repeated .google.spanner.v1.Session session = 1; */ - public com.google.spanner.v1.Session.Builder addSessionBuilder() { - return getSessionFieldBuilder() - .addBuilder(com.google.spanner.v1.Session.getDefaultInstance()); + public Session.Builder addSessionBuilder() { + return getSessionFieldBuilder().addBuilder(Session.getDefaultInstance()); } /** * @@ -859,9 +835,8 @@ public com.google.spanner.v1.Session.Builder addSessionBuilder() { * * repeated .google.spanner.v1.Session session = 1; */ - public com.google.spanner.v1.Session.Builder addSessionBuilder(int index) { - return getSessionFieldBuilder() - .addBuilder(index, com.google.spanner.v1.Session.getDefaultInstance()); + public Session.Builder addSessionBuilder(int index) { + return getSessionFieldBuilder().addBuilder(index, Session.getDefaultInstance()); } /** * @@ -872,33 +847,28 @@ public com.google.spanner.v1.Session.Builder addSessionBuilder(int index) { * * repeated .google.spanner.v1.Session session = 1; */ - public java.util.List getSessionBuilderList() { + public java.util.List getSessionBuilderList() { return getSessionFieldBuilder().getBuilderList(); } - private com.google.protobuf.RepeatedFieldBuilderV3< - com.google.spanner.v1.Session, - com.google.spanner.v1.Session.Builder, - com.google.spanner.v1.SessionOrBuilder> + private com.google.protobuf.RepeatedFieldBuilderV3 getSessionFieldBuilder() { if (sessionBuilder_ == null) { sessionBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - com.google.spanner.v1.Session, - com.google.spanner.v1.Session.Builder, - com.google.spanner.v1.SessionOrBuilder>( + Session, Session.Builder, SessionOrBuilder>( session_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); session_ = null; } return sessionBuilder_; } - @java.lang.Override + @Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -908,19 +878,19 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:google.spanner.v1.BatchCreateSessionsResponse) - private static final com.google.spanner.v1.BatchCreateSessionsResponse DEFAULT_INSTANCE; + private static final BatchCreateSessionsResponse DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.google.spanner.v1.BatchCreateSessionsResponse(); + DEFAULT_INSTANCE = new BatchCreateSessionsResponse(); } - public static com.google.spanner.v1.BatchCreateSessionsResponse getDefaultInstance() { + public static BatchCreateSessionsResponse getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public BatchCreateSessionsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -933,13 +903,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.google.spanner.v1.BatchCreateSessionsResponse getDefaultInstanceForType() { + @Override + public BatchCreateSessionsResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponseOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponseOrBuilder.java index 8c6fd582b7..2b94fe2a53 100644 --- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponseOrBuilder.java +++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponseOrBuilder.java @@ -32,7 +32,7 @@ public interface BatchCreateSessionsResponseOrBuilder * * repeated .google.spanner.v1.Session session = 1; */ - java.util.List getSessionList(); + java.util.List getSessionList(); /** * * @@ -42,7 +42,7 @@ public interface BatchCreateSessionsResponseOrBuilder * * repeated .google.spanner.v1.Session session = 1; */ - com.google.spanner.v1.Session getSession(int index); + Session getSession(int index); /** * * @@ -62,7 +62,7 @@ public interface BatchCreateSessionsResponseOrBuilder * * repeated .google.spanner.v1.Session session = 1; */ - java.util.List getSessionOrBuilderList(); + java.util.List getSessionOrBuilderList(); /** * * @@ -72,5 +72,5 @@ public interface BatchCreateSessionsResponseOrBuilder * * repeated .google.spanner.v1.Session session = 1; */ - com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder(int index); + SessionOrBuilder getSessionOrBuilder(int index); } diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java index e2e7d1e489..51c2440329 100644 --- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java +++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java @@ -71,51 +71,51 @@ private BeginTransactionRequest( done = true; break; case 10: - { - java.lang.String s = input.readStringRequireUtf8(); + { + java.lang.String s = input.readStringRequireUtf8(); - session_ = s; - break; - } + session_ = s; + break; + } case 18: - { - com.google.spanner.v1.TransactionOptions.Builder subBuilder = null; - if (options_ != null) { - subBuilder = options_.toBuilder(); - } - options_ = - input.readMessage( - com.google.spanner.v1.TransactionOptions.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(options_); - options_ = subBuilder.buildPartial(); - } - - break; + { + com.google.spanner.v1.TransactionOptions.Builder subBuilder = null; + if (options_ != null) { + subBuilder = options_.toBuilder(); + } + options_ = + input.readMessage( + com.google.spanner.v1.TransactionOptions.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(options_); + options_ = subBuilder.buildPartial(); } + + break; + } case 26: - { - com.google.spanner.v1.RequestOptions.Builder subBuilder = null; - if (requestOptions_ != null) { - subBuilder = requestOptions_.toBuilder(); - } - requestOptions_ = - input.readMessage( - com.google.spanner.v1.RequestOptions.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(requestOptions_); - requestOptions_ = subBuilder.buildPartial(); - } - - break; + { + com.google.spanner.v1.RequestOptions.Builder subBuilder = null; + if (requestOptions_ != null) { + subBuilder = requestOptions_.toBuilder(); } + requestOptions_ = + input.readMessage( + com.google.spanner.v1.RequestOptions.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(requestOptions_); + requestOptions_ = subBuilder.buildPartial(); + } + + break; + } default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; + { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { + done = true; } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -135,7 +135,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + internalGetFieldAccessorTable() { return com.google.spanner.v1.SpannerProto .internal_static_google_spanner_v1_BeginTransactionRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -517,7 +517,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + internalGetFieldAccessorTable() { return com.google.spanner.v1.SpannerProto .internal_static_google_spanner_v1_BeginTransactionRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -800,9 +800,9 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) { private com.google.spanner.v1.TransactionOptions options_; private com.google.protobuf.SingleFieldBuilderV3< - com.google.spanner.v1.TransactionOptions, - com.google.spanner.v1.TransactionOptions.Builder, - com.google.spanner.v1.TransactionOptionsOrBuilder> + com.google.spanner.v1.TransactionOptions, + com.google.spanner.v1.TransactionOptions.Builder, + com.google.spanner.v1.TransactionOptionsOrBuilder> optionsBuilder_; /** * @@ -985,10 +985,10 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getOptionsOrBuilder() { * */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.spanner.v1.TransactionOptions, - com.google.spanner.v1.TransactionOptions.Builder, - com.google.spanner.v1.TransactionOptionsOrBuilder> - getOptionsFieldBuilder() { + com.google.spanner.v1.TransactionOptions, + com.google.spanner.v1.TransactionOptions.Builder, + com.google.spanner.v1.TransactionOptionsOrBuilder> + getOptionsFieldBuilder() { if (optionsBuilder_ == null) { optionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -1003,9 +1003,9 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getOptionsOrBuilder() { private com.google.spanner.v1.RequestOptions requestOptions_; private com.google.protobuf.SingleFieldBuilderV3< - com.google.spanner.v1.RequestOptions, - com.google.spanner.v1.RequestOptions.Builder, - com.google.spanner.v1.RequestOptionsOrBuilder> + com.google.spanner.v1.RequestOptions, + com.google.spanner.v1.RequestOptions.Builder, + com.google.spanner.v1.RequestOptionsOrBuilder> requestOptionsBuilder_; /** * @@ -1206,10 +1206,10 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder( * .google.spanner.v1.RequestOptions request_options = 3; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.spanner.v1.RequestOptions, - com.google.spanner.v1.RequestOptions.Builder, - com.google.spanner.v1.RequestOptionsOrBuilder> - getRequestOptionsFieldBuilder() { + com.google.spanner.v1.RequestOptions, + com.google.spanner.v1.RequestOptions.Builder, + com.google.spanner.v1.RequestOptionsOrBuilder> + getRequestOptionsFieldBuilder() { if (requestOptionsBuilder_ == null) { requestOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -1271,4 +1271,4 @@ public com.google.protobuf.Parser getParserForType() { public com.google.spanner.v1.BeginTransactionRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } -} +} \ No newline at end of file diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequestOrBuilder.java index 61c73dbe37..ea9769a3ea 100644 --- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequestOrBuilder.java +++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequestOrBuilder.java @@ -36,7 +36,7 @@ public interface BeginTransactionRequestOrBuilder * * @return The session. */ - java.lang.String getSession(); + String getSession(); /** * * @@ -79,7 +79,7 @@ public interface BeginTransactionRequestOrBuilder * * @return The options. */ - com.google.spanner.v1.TransactionOptions getOptions(); + TransactionOptions getOptions(); /** * * diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java index 922cab734e..bcd2dae389 100644 --- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java +++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java @@ -73,72 +73,72 @@ private CommitRequest( done = true; break; case 10: - { - java.lang.String s = input.readStringRequireUtf8(); + { + java.lang.String s = input.readStringRequireUtf8(); - session_ = s; - break; - } + session_ = s; + break; + } case 18: - { - transactionCase_ = 2; - transaction_ = input.readBytes(); - break; - } + { + transactionCase_ = 2; + transaction_ = input.readBytes(); + break; + } case 26: - { - com.google.spanner.v1.TransactionOptions.Builder subBuilder = null; - if (transactionCase_ == 3) { - subBuilder = ((com.google.spanner.v1.TransactionOptions) transaction_).toBuilder(); - } - transaction_ = - input.readMessage( - com.google.spanner.v1.TransactionOptions.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.spanner.v1.TransactionOptions) transaction_); - transaction_ = subBuilder.buildPartial(); - } - transactionCase_ = 3; - break; + { + com.google.spanner.v1.TransactionOptions.Builder subBuilder = null; + if (transactionCase_ == 3) { + subBuilder = ((com.google.spanner.v1.TransactionOptions) transaction_).toBuilder(); + } + transaction_ = + input.readMessage( + com.google.spanner.v1.TransactionOptions.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((com.google.spanner.v1.TransactionOptions) transaction_); + transaction_ = subBuilder.buildPartial(); } + transactionCase_ = 3; + break; + } case 34: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - mutations_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - mutations_.add( - input.readMessage(com.google.spanner.v1.Mutation.parser(), extensionRegistry)); - break; + { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + mutations_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } + mutations_.add( + input.readMessage(com.google.spanner.v1.Mutation.parser(), extensionRegistry)); + break; + } case 40: - { - returnCommitStats_ = input.readBool(); - break; - } + { + returnCommitStats_ = input.readBool(); + break; + } case 50: - { - com.google.spanner.v1.RequestOptions.Builder subBuilder = null; - if (requestOptions_ != null) { - subBuilder = requestOptions_.toBuilder(); - } - requestOptions_ = - input.readMessage( - com.google.spanner.v1.RequestOptions.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(requestOptions_); - requestOptions_ = subBuilder.buildPartial(); - } - - break; + { + com.google.spanner.v1.RequestOptions.Builder subBuilder = null; + if (requestOptions_ != null) { + subBuilder = requestOptions_.toBuilder(); } + requestOptions_ = + input.readMessage( + com.google.spanner.v1.RequestOptions.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(requestOptions_); + requestOptions_ = subBuilder.buildPartial(); + } + + break; + } default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; + { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { + done = true; } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -161,7 +161,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + internalGetFieldAccessorTable() { return com.google.spanner.v1.SpannerProto .internal_static_google_spanner_v1_CommitRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -174,8 +174,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public enum TransactionCase implements - com.google.protobuf.Internal.EnumLite, - com.google.protobuf.AbstractMessage.InternalOneOfEnum { + com.google.protobuf.Internal.EnumLite, + com.google.protobuf.AbstractMessage.InternalOneOfEnum { TRANSACTION_ID(2), SINGLE_USE_TRANSACTION(3), TRANSACTION_NOT_SET(0); @@ -409,7 +409,7 @@ public java.util.List getMutationsList() { */ @java.lang.Override public java.util.List - getMutationsOrBuilderList() { + getMutationsOrBuilderList() { return mutations_; } /** @@ -776,7 +776,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + internalGetFieldAccessorTable() { return com.google.spanner.v1.SpannerProto .internal_static_google_spanner_v1_CommitRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -963,19 +963,19 @@ public Builder mergeFrom(com.google.spanner.v1.CommitRequest other) { } switch (other.getTransactionCase()) { case TRANSACTION_ID: - { - setTransactionId(other.getTransactionId()); - break; - } + { + setTransactionId(other.getTransactionId()); + break; + } case SINGLE_USE_TRANSACTION: - { - mergeSingleUseTransaction(other.getSingleUseTransaction()); - break; - } + { + mergeSingleUseTransaction(other.getSingleUseTransaction()); + break; + } case TRANSACTION_NOT_SET: - { - break; - } + { + break; + } } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -1211,9 +1211,9 @@ public Builder clearTransactionId() { } private com.google.protobuf.SingleFieldBuilderV3< - com.google.spanner.v1.TransactionOptions, - com.google.spanner.v1.TransactionOptions.Builder, - com.google.spanner.v1.TransactionOptionsOrBuilder> + com.google.spanner.v1.TransactionOptions, + com.google.spanner.v1.TransactionOptions.Builder, + com.google.spanner.v1.TransactionOptionsOrBuilder> singleUseTransactionBuilder_; /** * @@ -1352,7 +1352,7 @@ public Builder mergeSingleUseTransaction(com.google.spanner.v1.TransactionOption && transaction_ != com.google.spanner.v1.TransactionOptions.getDefaultInstance()) { transaction_ = com.google.spanner.v1.TransactionOptions.newBuilder( - (com.google.spanner.v1.TransactionOptions) transaction_) + (com.google.spanner.v1.TransactionOptions) transaction_) .mergeFrom(value) .buildPartial(); } else { @@ -1467,10 +1467,10 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getSingleUseTransaction * .google.spanner.v1.TransactionOptions single_use_transaction = 3; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.spanner.v1.TransactionOptions, - com.google.spanner.v1.TransactionOptions.Builder, - com.google.spanner.v1.TransactionOptionsOrBuilder> - getSingleUseTransactionFieldBuilder() { + com.google.spanner.v1.TransactionOptions, + com.google.spanner.v1.TransactionOptions.Builder, + com.google.spanner.v1.TransactionOptionsOrBuilder> + getSingleUseTransactionFieldBuilder() { if (singleUseTransactionBuilder_ == null) { if (!(transactionCase_ == 3)) { transaction_ = com.google.spanner.v1.TransactionOptions.getDefaultInstance(); @@ -1502,9 +1502,9 @@ private void ensureMutationsIsMutable() { } private com.google.protobuf.RepeatedFieldBuilderV3< - com.google.spanner.v1.Mutation, - com.google.spanner.v1.Mutation.Builder, - com.google.spanner.v1.MutationOrBuilder> + com.google.spanner.v1.Mutation, + com.google.spanner.v1.Mutation.Builder, + com.google.spanner.v1.MutationOrBuilder> mutationsBuilder_; /** @@ -1804,7 +1804,7 @@ public com.google.spanner.v1.MutationOrBuilder getMutationsOrBuilder(int index) * repeated .google.spanner.v1.Mutation mutations = 4; */ public java.util.List - getMutationsOrBuilderList() { + getMutationsOrBuilderList() { if (mutationsBuilder_ != null) { return mutationsBuilder_.getMessageOrBuilderList(); } else { @@ -1857,10 +1857,10 @@ public java.util.List getMutationsBuilde } private com.google.protobuf.RepeatedFieldBuilderV3< - com.google.spanner.v1.Mutation, - com.google.spanner.v1.Mutation.Builder, - com.google.spanner.v1.MutationOrBuilder> - getMutationsFieldBuilder() { + com.google.spanner.v1.Mutation, + com.google.spanner.v1.Mutation.Builder, + com.google.spanner.v1.MutationOrBuilder> + getMutationsFieldBuilder() { if (mutationsBuilder_ == null) { mutationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< @@ -1933,9 +1933,9 @@ public Builder clearReturnCommitStats() { private com.google.spanner.v1.RequestOptions requestOptions_; private com.google.protobuf.SingleFieldBuilderV3< - com.google.spanner.v1.RequestOptions, - com.google.spanner.v1.RequestOptions.Builder, - com.google.spanner.v1.RequestOptionsOrBuilder> + com.google.spanner.v1.RequestOptions, + com.google.spanner.v1.RequestOptions.Builder, + com.google.spanner.v1.RequestOptionsOrBuilder> requestOptionsBuilder_; /** * @@ -2100,10 +2100,10 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder( * .google.spanner.v1.RequestOptions request_options = 6; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.spanner.v1.RequestOptions, - com.google.spanner.v1.RequestOptions.Builder, - com.google.spanner.v1.RequestOptionsOrBuilder> - getRequestOptionsFieldBuilder() { + com.google.spanner.v1.RequestOptions, + com.google.spanner.v1.RequestOptions.Builder, + com.google.spanner.v1.RequestOptionsOrBuilder> + getRequestOptionsFieldBuilder() { if (requestOptionsBuilder_ == null) { requestOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -2165,4 +2165,4 @@ public com.google.protobuf.Parser getParserForType() { public com.google.spanner.v1.CommitRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } -} +} \ No newline at end of file diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequestOrBuilder.java index 67704563b2..c589daff09 100644 --- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequestOrBuilder.java +++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequestOrBuilder.java @@ -36,7 +36,7 @@ public interface CommitRequestOrBuilder * * @return The session. */ - java.lang.String getSession(); + String getSession(); /** * * @@ -116,7 +116,7 @@ public interface CommitRequestOrBuilder * * @return The singleUseTransaction. */ - com.google.spanner.v1.TransactionOptions getSingleUseTransaction(); + TransactionOptions getSingleUseTransaction(); /** * * @@ -134,7 +134,7 @@ public interface CommitRequestOrBuilder * * .google.spanner.v1.TransactionOptions single_use_transaction = 3; */ - com.google.spanner.v1.TransactionOptionsOrBuilder getSingleUseTransactionOrBuilder(); + TransactionOptionsOrBuilder getSingleUseTransactionOrBuilder(); /** * @@ -147,7 +147,7 @@ public interface CommitRequestOrBuilder * * repeated .google.spanner.v1.Mutation mutations = 4; */ - java.util.List getMutationsList(); + java.util.List getMutationsList(); /** * * @@ -159,7 +159,7 @@ public interface CommitRequestOrBuilder * * repeated .google.spanner.v1.Mutation mutations = 4; */ - com.google.spanner.v1.Mutation getMutations(int index); + Mutation getMutations(int index); /** * * @@ -183,7 +183,7 @@ public interface CommitRequestOrBuilder * * repeated .google.spanner.v1.Mutation mutations = 4; */ - java.util.List getMutationsOrBuilderList(); + java.util.List getMutationsOrBuilderList(); /** * * @@ -195,12 +195,13 @@ public interface CommitRequestOrBuilder * * repeated .google.spanner.v1.Mutation mutations = 4; */ - com.google.spanner.v1.MutationOrBuilder getMutationsOrBuilder(int index); + MutationOrBuilder getMutationsOrBuilder(int index); /** * * * 

    +<<<<<<< HEAD
    * If `true`, then statistics related to the transaction will be included in
    * the [CommitResponse][google.spanner.v1.CommitResponse.commit_stats]. Default value is
    * `false`.
@@ -216,6 +217,8 @@ public interface CommitRequestOrBuilder
    *
    *
    * 
    +=======
+>>>>>>> 5bbb0fe8 ([Tagging Feature] add support for tagging feature)
    * Common options for this request.
    * 
    
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java
index 320d165cf9..deb2b50573 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java
@@ -69,43 +69,43 @@ private CommitResponse(
             done = true;
             break;
           case 10:
-            {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (commitTimestamp_ != null) {
-                subBuilder = commitTimestamp_.toBuilder();
-              }
-              commitTimestamp_ =
-                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(commitTimestamp_);
-                commitTimestamp_ = subBuilder.buildPartial();
-              }
-
-              break;
+          {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (commitTimestamp_ != null) {
+              subBuilder = commitTimestamp_.toBuilder();
+            }
+            commitTimestamp_ =
+                input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(commitTimestamp_);
+              commitTimestamp_ = subBuilder.buildPartial();
             }
-          case 18:
-            {
-              com.google.spanner.v1.CommitResponse.CommitStats.Builder subBuilder = null;
-              if (commitStats_ != null) {
-                subBuilder = commitStats_.toBuilder();
-              }
-              commitStats_ =
-                  input.readMessage(
-                      com.google.spanner.v1.CommitResponse.CommitStats.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(commitStats_);
-                commitStats_ = subBuilder.buildPartial();
-              }
 
-              break;
+            break;
+          }
+          case 18:
+          {
+            com.google.spanner.v1.CommitResponse.CommitStats.Builder subBuilder = null;
+            if (commitStats_ != null) {
+              subBuilder = commitStats_.toBuilder();
+            }
+            commitStats_ =
+                input.readMessage(
+                    com.google.spanner.v1.CommitResponse.CommitStats.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(commitStats_);
+              commitStats_ = subBuilder.buildPartial();
             }
+
+            break;
+          }
           default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+          {
+            if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -125,7 +125,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
+  internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto
         .internal_static_google_spanner_v1_CommitResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
@@ -208,17 +208,17 @@ private CommitStats(
               done = true;
               break;
             case 8:
-              {
-                mutationCount_ = input.readInt64();
-                break;
-              }
+            {
+              mutationCount_ = input.readInt64();
+              break;
+            }
             default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
               }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -238,7 +238,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
+    internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_CommitResponse_CommitStats_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -451,7 +451,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
+      internalGetFieldAccessorTable() {
         return com.google.spanner.v1.SpannerProto
             .internal_static_google_spanner_v1_CommitResponse_CommitStats_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1011,7 +1011,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
+    internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_CommitResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -1170,9 +1170,9 @@ public Builder mergeFrom(
 
     private com.google.protobuf.Timestamp commitTimestamp_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Timestamp,
-            com.google.protobuf.Timestamp.Builder,
-            com.google.protobuf.TimestampOrBuilder>
+        com.google.protobuf.Timestamp,
+        com.google.protobuf.Timestamp.Builder,
+        com.google.protobuf.TimestampOrBuilder>
         commitTimestampBuilder_;
     /**
      *
@@ -1337,10 +1337,10 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimestampOrBuilder() {
      * .google.protobuf.Timestamp commit_timestamp = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Timestamp,
-            com.google.protobuf.Timestamp.Builder,
-            com.google.protobuf.TimestampOrBuilder>
-        getCommitTimestampFieldBuilder() {
+        com.google.protobuf.Timestamp,
+        com.google.protobuf.Timestamp.Builder,
+        com.google.protobuf.TimestampOrBuilder>
+    getCommitTimestampFieldBuilder() {
       if (commitTimestampBuilder_ == null) {
         commitTimestampBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -1355,9 +1355,9 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimestampOrBuilder() {
 
     private com.google.spanner.v1.CommitResponse.CommitStats commitStats_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.CommitResponse.CommitStats,
-            com.google.spanner.v1.CommitResponse.CommitStats.Builder,
-            com.google.spanner.v1.CommitResponse.CommitStatsOrBuilder>
+        com.google.spanner.v1.CommitResponse.CommitStats,
+        com.google.spanner.v1.CommitResponse.CommitStats.Builder,
+        com.google.spanner.v1.CommitResponse.CommitStatsOrBuilder>
         commitStatsBuilder_;
     /**
      *
@@ -1541,10 +1541,10 @@ public com.google.spanner.v1.CommitResponse.CommitStatsOrBuilder getCommitStatsO
      * .google.spanner.v1.CommitResponse.CommitStats commit_stats = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.CommitResponse.CommitStats,
-            com.google.spanner.v1.CommitResponse.CommitStats.Builder,
-            com.google.spanner.v1.CommitResponse.CommitStatsOrBuilder>
-        getCommitStatsFieldBuilder() {
+        com.google.spanner.v1.CommitResponse.CommitStats,
+        com.google.spanner.v1.CommitResponse.CommitStats.Builder,
+        com.google.spanner.v1.CommitResponse.CommitStatsOrBuilder>
+    getCommitStatsFieldBuilder() {
       if (commitStatsBuilder_ == null) {
         commitStatsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -1606,4 +1606,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.spanner.v1.CommitResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-}
+}
\ No newline at end of file
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java
index ea35c5266a..fdde650613 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java
@@ -41,13 +41,13 @@ private CreateSessionRequest() {
     database_ = "";
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new CreateSessionRequest();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private CreateSessionRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -72,19 +72,18 @@ private CreateSessionRequest(
             break;
           case 10:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               database_ = s;
               break;
             }
           case 18:
             {
-              com.google.spanner.v1.Session.Builder subBuilder = null;
+              Session.Builder subBuilder = null;
               if (session_ != null) {
                 subBuilder = session_.toBuilder();
               }
-              session_ =
-                  input.readMessage(com.google.spanner.v1.Session.parser(), extensionRegistry);
+              session_ = input.readMessage(Session.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(session_);
                 session_ = subBuilder.buildPartial();
@@ -112,22 +111,17 @@ private CreateSessionRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
+    return SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_CreateSessionRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.CreateSessionRequest.class,
-            com.google.spanner.v1.CreateSessionRequest.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(CreateSessionRequest.class, Builder.class);
   }
 
   public static final int DATABASE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object database_;
+  private volatile Object database_;
   /**
    *
    *
@@ -141,14 +135,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The database.
    */
-  @java.lang.Override
-  public java.lang.String getDatabase() {
-    java.lang.Object ref = database_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getDatabase() {
+    Object ref = database_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       database_ = s;
       return s;
     }
@@ -166,12 +160,11 @@ public java.lang.String getDatabase() {
    *
    * @return The bytes for database.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ByteString getDatabaseBytes() {
-    java.lang.Object ref = database_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+    Object ref = database_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       database_ = b;
       return b;
     } else {
@@ -180,7 +173,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
   }
 
   public static final int SESSION_FIELD_NUMBER = 2;
-  private com.google.spanner.v1.Session session_;
+  private Session session_;
   /**
    *
    *
@@ -192,7 +185,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
    *
    * @return Whether the session field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasSession() {
     return session_ != null;
   }
@@ -207,9 +200,9 @@ public boolean hasSession() {
    *
    * @return The session.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Session getSession() {
-    return session_ == null ? com.google.spanner.v1.Session.getDefaultInstance() : session_;
+  @Override
+  public Session getSession() {
+    return session_ == null ? Session.getDefaultInstance() : session_;
   }
   /**
    *
@@ -220,14 +213,14 @@ public com.google.spanner.v1.Session getSession() {
    *
    * .google.spanner.v1.Session session = 2;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder() {
+  @Override
+  public SessionOrBuilder getSessionOrBuilder() {
     return getSession();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -237,7 +230,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, database_);
@@ -248,7 +241,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,16 +258,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.CreateSessionRequest)) {
+    if (!(obj instanceof CreateSessionRequest)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.CreateSessionRequest other =
-        (com.google.spanner.v1.CreateSessionRequest) obj;
+    CreateSessionRequest other = (CreateSessionRequest) obj;
 
     if (!getDatabase().equals(other.getDatabase())) return false;
     if (hasSession() != other.hasSession()) return false;
@@ -285,7 +277,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -303,71 +295,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.CreateSessionRequest parseFrom(java.nio.ByteBuffer data)
+  public static CreateSessionRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.CreateSessionRequest parseFrom(
+  public static CreateSessionRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.CreateSessionRequest parseFrom(
-      com.google.protobuf.ByteString data)
+  public static CreateSessionRequest parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.CreateSessionRequest parseFrom(
+  public static CreateSessionRequest 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.spanner.v1.CreateSessionRequest parseFrom(byte[] data)
+  public static CreateSessionRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.CreateSessionRequest parseFrom(
+  public static CreateSessionRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.CreateSessionRequest parseFrom(java.io.InputStream input)
+  public static CreateSessionRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.CreateSessionRequest parseFrom(
+  public static CreateSessionRequest 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.spanner.v1.CreateSessionRequest parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
+  public static CreateSessionRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.CreateSessionRequest parseDelimitedFrom(
+  public static CreateSessionRequest 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.spanner.v1.CreateSessionRequest parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static CreateSessionRequest parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.CreateSessionRequest parseFrom(
+  public static CreateSessionRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -375,7 +366,7 @@ public static com.google.spanner.v1.CreateSessionRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -384,17 +375,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.CreateSessionRequest prototype) {
+  public static Builder newBuilder(CreateSessionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -410,20 +401,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.CreateSessionRequest)
-      com.google.spanner.v1.CreateSessionRequestOrBuilder {
+      CreateSessionRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_CreateSessionRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.CreateSessionRequest.class,
-              com.google.spanner.v1.CreateSessionRequest.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(CreateSessionRequest.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.CreateSessionRequest.newBuilder()
@@ -431,7 +417,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -440,7 +426,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -454,30 +440,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.CreateSessionRequest getDefaultInstanceForType() {
-      return com.google.spanner.v1.CreateSessionRequest.getDefaultInstance();
+    @Override
+    public CreateSessionRequest getDefaultInstanceForType() {
+      return CreateSessionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.CreateSessionRequest build() {
-      com.google.spanner.v1.CreateSessionRequest result = buildPartial();
+    @Override
+    public CreateSessionRequest build() {
+      CreateSessionRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.CreateSessionRequest buildPartial() {
-      com.google.spanner.v1.CreateSessionRequest result =
-          new com.google.spanner.v1.CreateSessionRequest(this);
+    @Override
+    public CreateSessionRequest buildPartial() {
+      CreateSessionRequest result = new CreateSessionRequest(this);
       result.database_ = database_;
       if (sessionBuilder_ == null) {
         result.session_ = session_;
@@ -488,51 +472,50 @@ public com.google.spanner.v1.CreateSessionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.CreateSessionRequest) {
-        return mergeFrom((com.google.spanner.v1.CreateSessionRequest) other);
+      if (other instanceof CreateSessionRequest) {
+        return mergeFrom((CreateSessionRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.CreateSessionRequest other) {
-      if (other == com.google.spanner.v1.CreateSessionRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(CreateSessionRequest other) {
+      if (other == CreateSessionRequest.getDefaultInstance()) return this;
       if (!other.getDatabase().isEmpty()) {
         database_ = other.database_;
         onChanged();
@@ -545,21 +528,21 @@ public Builder mergeFrom(com.google.spanner.v1.CreateSessionRequest other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.CreateSessionRequest parsedMessage = null;
+      CreateSessionRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.CreateSessionRequest) e.getUnfinishedMessage();
+        parsedMessage = (CreateSessionRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -569,7 +552,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private java.lang.Object database_ = "";
+    private Object database_ = "";
     /**
      *
      *
@@ -583,15 +566,15 @@ public Builder mergeFrom(
      *
      * @return The database.
      */
-    public java.lang.String getDatabase() {
-      java.lang.Object ref = database_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getDatabase() {
+      Object ref = database_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         database_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -608,10 +591,10 @@ public java.lang.String getDatabase() {
      * @return The bytes for database.
      */
     public com.google.protobuf.ByteString getDatabaseBytes() {
-      java.lang.Object ref = database_;
+      Object ref = database_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         database_ = b;
         return b;
       } else {
@@ -632,7 +615,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
      * @param value The database to set.
      * @return This builder for chaining.
      */
-    public Builder setDatabase(java.lang.String value) {
+    public Builder setDatabase(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -685,11 +668,8 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.spanner.v1.Session session_;
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Session,
-            com.google.spanner.v1.Session.Builder,
-            com.google.spanner.v1.SessionOrBuilder>
+    private Session session_;
+    private com.google.protobuf.SingleFieldBuilderV3
         sessionBuilder_;
     /**
      *
@@ -716,9 +696,9 @@ public boolean hasSession() {
      *
      * @return The session.
      */
-    public com.google.spanner.v1.Session getSession() {
+    public Session getSession() {
       if (sessionBuilder_ == null) {
-        return session_ == null ? com.google.spanner.v1.Session.getDefaultInstance() : session_;
+        return session_ == null ? Session.getDefaultInstance() : session_;
       } else {
         return sessionBuilder_.getMessage();
       }
@@ -732,7 +712,7 @@ public com.google.spanner.v1.Session getSession() {
      *
      * .google.spanner.v1.Session session = 2;
      */
-    public Builder setSession(com.google.spanner.v1.Session value) {
+    public Builder setSession(Session value) {
       if (sessionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -754,7 +734,7 @@ public Builder setSession(com.google.spanner.v1.Session value) {
      *
      * .google.spanner.v1.Session session = 2;
      */
-    public Builder setSession(com.google.spanner.v1.Session.Builder builderForValue) {
+    public Builder setSession(Session.Builder builderForValue) {
       if (sessionBuilder_ == null) {
         session_ = builderForValue.build();
         onChanged();
@@ -773,11 +753,10 @@ public Builder setSession(com.google.spanner.v1.Session.Builder builderForValue)
      *
      * .google.spanner.v1.Session session = 2;
      */
-    public Builder mergeSession(com.google.spanner.v1.Session value) {
+    public Builder mergeSession(Session value) {
       if (sessionBuilder_ == null) {
         if (session_ != null) {
-          session_ =
-              com.google.spanner.v1.Session.newBuilder(session_).mergeFrom(value).buildPartial();
+          session_ = Session.newBuilder(session_).mergeFrom(value).buildPartial();
         } else {
           session_ = value;
         }
@@ -817,7 +796,7 @@ public Builder clearSession() {
      *
      * .google.spanner.v1.Session session = 2;
      */
-    public com.google.spanner.v1.Session.Builder getSessionBuilder() {
+    public Session.Builder getSessionBuilder() {
 
       onChanged();
       return getSessionFieldBuilder().getBuilder();
@@ -831,11 +810,11 @@ public com.google.spanner.v1.Session.Builder getSessionBuilder() {
      *
      * .google.spanner.v1.Session session = 2;
      */
-    public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder() {
+    public SessionOrBuilder getSessionOrBuilder() {
       if (sessionBuilder_ != null) {
         return sessionBuilder_.getMessageOrBuilder();
       } else {
-        return session_ == null ? com.google.spanner.v1.Session.getDefaultInstance() : session_;
+        return session_ == null ? Session.getDefaultInstance() : session_;
       }
     }
     /**
@@ -847,29 +826,24 @@ public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder() {
      *
      * .google.spanner.v1.Session session = 2;
      */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Session,
-            com.google.spanner.v1.Session.Builder,
-            com.google.spanner.v1.SessionOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         getSessionFieldBuilder() {
       if (sessionBuilder_ == null) {
         sessionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.Session,
-                com.google.spanner.v1.Session.Builder,
-                com.google.spanner.v1.SessionOrBuilder>(
+                Session, Session.Builder, SessionOrBuilder>(
                 getSession(), getParentForChildren(), isClean());
         session_ = null;
       }
       return sessionBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -879,19 +853,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.CreateSessionRequest)
-  private static final com.google.spanner.v1.CreateSessionRequest DEFAULT_INSTANCE;
+  private static final CreateSessionRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.CreateSessionRequest();
+    DEFAULT_INSTANCE = new CreateSessionRequest();
   }
 
-  public static com.google.spanner.v1.CreateSessionRequest getDefaultInstance() {
+  public static CreateSessionRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public CreateSessionRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -904,13 +878,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.CreateSessionRequest getDefaultInstanceForType() {
+  @Override
+  public CreateSessionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequestOrBuilder.java
index 3966d85f95..c4f3457143 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface CreateSessionRequestOrBuilder
    *
    * @return The database.
    */
-  java.lang.String getDatabase();
+  String getDatabase();
   /**
    *
    *
@@ -75,7 +75,7 @@ public interface CreateSessionRequestOrBuilder
    *
    * @return The session.
    */
-  com.google.spanner.v1.Session getSession();
+  Session getSession();
   /**
    *
    *
@@ -85,5 +85,5 @@ public interface CreateSessionRequestOrBuilder
    *
    * .google.spanner.v1.Session session = 2;
    */
-  com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder();
+  SessionOrBuilder getSessionOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java
index ca462176e7..974d6345eb 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java
@@ -41,13 +41,13 @@ private DeleteSessionRequest() {
     name_ = "";
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new DeleteSessionRequest();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private DeleteSessionRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -72,7 +72,7 @@ private DeleteSessionRequest(
             break;
           case 10:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               name_ = s;
               break;
@@ -97,22 +97,17 @@ private DeleteSessionRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
+    return SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_DeleteSessionRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.DeleteSessionRequest.class,
-            com.google.spanner.v1.DeleteSessionRequest.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(DeleteSessionRequest.class, Builder.class);
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+  private volatile Object name_;
   /**
    *
    *
@@ -126,14 +121,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The name.
    */
-  @java.lang.Override
-  public java.lang.String getName() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getName() {
+    Object ref = name_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       name_ = s;
       return s;
     }
@@ -151,12 +146,11 @@ public java.lang.String getName() {
    *
    * @return The bytes for name.
    */
-  @java.lang.Override
+  @Override
   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);
+    Object ref = name_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       name_ = b;
       return b;
     } else {
@@ -166,7 +160,7 @@ public com.google.protobuf.ByteString getNameBytes() {
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -176,7 +170,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
@@ -184,7 +178,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -198,23 +192,22 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.DeleteSessionRequest)) {
+    if (!(obj instanceof DeleteSessionRequest)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.DeleteSessionRequest other =
-        (com.google.spanner.v1.DeleteSessionRequest) obj;
+    DeleteSessionRequest other = (DeleteSessionRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -228,71 +221,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(java.nio.ByteBuffer data)
+  public static DeleteSessionRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
+  public static DeleteSessionRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
-      com.google.protobuf.ByteString data)
+  public static DeleteSessionRequest parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
+  public static DeleteSessionRequest 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.spanner.v1.DeleteSessionRequest parseFrom(byte[] data)
+  public static DeleteSessionRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
+  public static DeleteSessionRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(java.io.InputStream input)
+  public static DeleteSessionRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
+  public static DeleteSessionRequest 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.spanner.v1.DeleteSessionRequest parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
+  public static DeleteSessionRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.DeleteSessionRequest parseDelimitedFrom(
+  public static DeleteSessionRequest 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.spanner.v1.DeleteSessionRequest parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static DeleteSessionRequest parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
+  public static DeleteSessionRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -300,7 +292,7 @@ public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -309,17 +301,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.DeleteSessionRequest prototype) {
+  public static Builder newBuilder(DeleteSessionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -335,20 +327,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.DeleteSessionRequest)
-      com.google.spanner.v1.DeleteSessionRequestOrBuilder {
+      DeleteSessionRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_DeleteSessionRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.DeleteSessionRequest.class,
-              com.google.spanner.v1.DeleteSessionRequest.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(DeleteSessionRequest.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.DeleteSessionRequest.newBuilder()
@@ -356,7 +343,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -365,7 +352,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -373,80 +360,77 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.DeleteSessionRequest getDefaultInstanceForType() {
-      return com.google.spanner.v1.DeleteSessionRequest.getDefaultInstance();
+    @Override
+    public DeleteSessionRequest getDefaultInstanceForType() {
+      return DeleteSessionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.DeleteSessionRequest build() {
-      com.google.spanner.v1.DeleteSessionRequest result = buildPartial();
+    @Override
+    public DeleteSessionRequest build() {
+      DeleteSessionRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.DeleteSessionRequest buildPartial() {
-      com.google.spanner.v1.DeleteSessionRequest result =
-          new com.google.spanner.v1.DeleteSessionRequest(this);
+    @Override
+    public DeleteSessionRequest buildPartial() {
+      DeleteSessionRequest result = new DeleteSessionRequest(this);
       result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.DeleteSessionRequest) {
-        return mergeFrom((com.google.spanner.v1.DeleteSessionRequest) other);
+      if (other instanceof DeleteSessionRequest) {
+        return mergeFrom((DeleteSessionRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.DeleteSessionRequest other) {
-      if (other == com.google.spanner.v1.DeleteSessionRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(DeleteSessionRequest other) {
+      if (other == DeleteSessionRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
         onChanged();
@@ -456,21 +440,21 @@ public Builder mergeFrom(com.google.spanner.v1.DeleteSessionRequest other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.DeleteSessionRequest parsedMessage = null;
+      DeleteSessionRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.DeleteSessionRequest) e.getUnfinishedMessage();
+        parsedMessage = (DeleteSessionRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -480,7 +464,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private java.lang.Object name_ = "";
+    private Object name_ = "";
     /**
      *
      *
@@ -494,15 +478,15 @@ public Builder mergeFrom(
      *
      * @return The name.
      */
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getName() {
+      Object ref = name_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         name_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -519,10 +503,10 @@ public java.lang.String getName() {
      * @return The bytes for name.
      */
     public com.google.protobuf.ByteString getNameBytes() {
-      java.lang.Object ref = name_;
+      Object ref = name_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         name_ = b;
         return b;
       } else {
@@ -543,7 +527,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      * @param value The name to set.
      * @return This builder for chaining.
      */
-    public Builder setName(java.lang.String value) {
+    public Builder setName(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -596,12 +580,12 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -611,19 +595,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.DeleteSessionRequest)
-  private static final com.google.spanner.v1.DeleteSessionRequest DEFAULT_INSTANCE;
+  private static final DeleteSessionRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.DeleteSessionRequest();
+    DEFAULT_INSTANCE = new DeleteSessionRequest();
   }
 
-  public static com.google.spanner.v1.DeleteSessionRequest getDefaultInstance() {
+  public static DeleteSessionRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public DeleteSessionRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -636,13 +620,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.DeleteSessionRequest getDefaultInstanceForType() {
+  @Override
+  public DeleteSessionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequestOrBuilder.java
index 5774259370..1107a65932 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface DeleteSessionRequestOrBuilder
    *
    * @return The name.
    */
-  java.lang.String getName();
+  String getName();
   /**
    *
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequest.java
index 0a7820ed53..e128839b02 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequest.java
@@ -73,70 +73,70 @@ private ExecuteBatchDmlRequest(
             done = true;
             break;
           case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+          {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              session_ = s;
-              break;
-            }
+            session_ = s;
+            break;
+          }
           case 18:
-            {
-              com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
-              if (transaction_ != null) {
-                subBuilder = transaction_.toBuilder();
-              }
-              transaction_ =
-                  input.readMessage(
-                      com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(transaction_);
-                transaction_ = subBuilder.buildPartial();
-              }
-
-              break;
+          {
+            com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
+            if (transaction_ != null) {
+              subBuilder = transaction_.toBuilder();
             }
+            transaction_ =
+                input.readMessage(
+                    com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(transaction_);
+              transaction_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
           case 26:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                statements_ =
-                    new java.util.ArrayList<
-                        com.google.spanner.v1.ExecuteBatchDmlRequest.Statement>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              statements_.add(
-                  input.readMessage(
-                      com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.parser(),
-                      extensionRegistry));
-              break;
+          {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              statements_ =
+                  new java.util.ArrayList<
+                      com.google.spanner.v1.ExecuteBatchDmlRequest.Statement>();
+              mutable_bitField0_ |= 0x00000001;
             }
+            statements_.add(
+                input.readMessage(
+                    com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.parser(),
+                    extensionRegistry));
+            break;
+          }
           case 32:
-            {
-              seqno_ = input.readInt64();
-              break;
-            }
+          {
+            seqno_ = input.readInt64();
+            break;
+          }
           case 42:
-            {
-              com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
-              if (requestOptions_ != null) {
-                subBuilder = requestOptions_.toBuilder();
-              }
-              requestOptions_ =
-                  input.readMessage(
-                      com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(requestOptions_);
-                requestOptions_ = subBuilder.buildPartial();
-              }
-
-              break;
+          {
+            com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
+            if (requestOptions_ != null) {
+              subBuilder = requestOptions_.toBuilder();
             }
+            requestOptions_ =
+                input.readMessage(
+                    com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(requestOptions_);
+              requestOptions_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
           default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+          {
+            if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -159,7 +159,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
+  internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto
         .internal_static_google_spanner_v1_ExecuteBatchDmlRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
@@ -392,49 +392,49 @@ private Statement(
               done = true;
               break;
             case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-                sql_ = s;
-                break;
-              }
+              sql_ = s;
+              break;
+            }
             case 18:
-              {
-                com.google.protobuf.Struct.Builder subBuilder = null;
-                if (params_ != null) {
-                  subBuilder = params_.toBuilder();
-                }
-                params_ = input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(params_);
-                  params_ = subBuilder.buildPartial();
-                }
-
-                break;
+            {
+              com.google.protobuf.Struct.Builder subBuilder = null;
+              if (params_ != null) {
+                subBuilder = params_.toBuilder();
+              }
+              params_ = input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(params_);
+                params_ = subBuilder.buildPartial();
               }
+
+              break;
+            }
             case 26:
-              {
-                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                  paramTypes_ =
-                      com.google.protobuf.MapField.newMapField(
-                          ParamTypesDefaultEntryHolder.defaultEntry);
-                  mutable_bitField0_ |= 0x00000001;
-                }
-                com.google.protobuf.MapEntry
-                    paramTypes__ =
-                        input.readMessage(
-                            ParamTypesDefaultEntryHolder.defaultEntry.getParserForType(),
-                            extensionRegistry);
-                paramTypes_.getMutableMap().put(paramTypes__.getKey(), paramTypes__.getValue());
-                break;
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                paramTypes_ =
+                    com.google.protobuf.MapField.newMapField(
+                        ParamTypesDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
               }
+              com.google.protobuf.MapEntry
+                  paramTypes__ =
+                  input.readMessage(
+                      ParamTypesDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              paramTypes_.getMutableMap().put(paramTypes__.getKey(), paramTypes__.getValue());
+              break;
+            }
             default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
               }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -465,7 +465,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
+    internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_ExecuteBatchDmlRequest_Statement_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -594,20 +594,20 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
     private static final class ParamTypesDefaultEntryHolder {
       static final com.google.protobuf.MapEntry
           defaultEntry =
-              com.google.protobuf.MapEntry
-                  .newDefaultInstance(
-                      com.google.spanner.v1.SpannerProto
-                          .internal_static_google_spanner_v1_ExecuteBatchDmlRequest_Statement_ParamTypesEntry_descriptor,
-                      com.google.protobuf.WireFormat.FieldType.STRING,
-                      "",
-                      com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                      com.google.spanner.v1.Type.getDefaultInstance());
+          com.google.protobuf.MapEntry
+              .newDefaultInstance(
+                  com.google.spanner.v1.SpannerProto
+                      .internal_static_google_spanner_v1_ExecuteBatchDmlRequest_Statement_ParamTypesEntry_descriptor,
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                  com.google.spanner.v1.Type.getDefaultInstance());
     }
 
     private com.google.protobuf.MapField paramTypes_;
 
     private com.google.protobuf.MapField
-        internalGetParamTypes() {
+    internalGetParamTypes() {
       if (paramTypes_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             ParamTypesDefaultEntryHolder.defaultEntry);
@@ -951,7 +951,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
+      internalGetFieldAccessorTable() {
         return com.google.spanner.v1.SpannerProto
             .internal_static_google_spanner_v1_ExecuteBatchDmlRequest_Statement_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1221,9 +1221,9 @@ public Builder setSqlBytes(com.google.protobuf.ByteString value) {
 
       private com.google.protobuf.Struct params_;
       private com.google.protobuf.SingleFieldBuilderV3<
-              com.google.protobuf.Struct,
-              com.google.protobuf.Struct.Builder,
-              com.google.protobuf.StructOrBuilder>
+          com.google.protobuf.Struct,
+          com.google.protobuf.Struct.Builder,
+          com.google.protobuf.StructOrBuilder>
           paramsBuilder_;
       /**
        *
@@ -1445,10 +1445,10 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
        * .google.protobuf.Struct params = 2;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-              com.google.protobuf.Struct,
-              com.google.protobuf.Struct.Builder,
-              com.google.protobuf.StructOrBuilder>
-          getParamsFieldBuilder() {
+          com.google.protobuf.Struct,
+          com.google.protobuf.Struct.Builder,
+          com.google.protobuf.StructOrBuilder>
+      getParamsFieldBuilder() {
         if (paramsBuilder_ == null) {
           paramsBuilder_ =
               new com.google.protobuf.SingleFieldBuilderV3<
@@ -1465,7 +1465,7 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
           paramTypes_;
 
       private com.google.protobuf.MapField
-          internalGetParamTypes() {
+      internalGetParamTypes() {
         if (paramTypes_ == null) {
           return com.google.protobuf.MapField.emptyMapField(
               ParamTypesDefaultEntryHolder.defaultEntry);
@@ -1474,7 +1474,7 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
       }
 
       private com.google.protobuf.MapField
-          internalGetMutableParamTypes() {
+      internalGetMutableParamTypes() {
         onChanged();
         ;
         if (paramTypes_ == null) {
@@ -1854,7 +1854,7 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
    */
   @java.lang.Override
   public java.util.List
-      getStatementsList() {
+  getStatementsList() {
     return statements_;
   }
   /**
@@ -1874,7 +1874,7 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
    */
   @java.lang.Override
   public java.util.List
-      getStatementsOrBuilderList() {
+  getStatementsOrBuilderList() {
     return statements_;
   }
   /**
@@ -2235,7 +2235,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
+    internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_ExecuteBatchDmlRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -2571,9 +2571,9 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
 
     private com.google.spanner.v1.TransactionSelector transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionSelector,
-            com.google.spanner.v1.TransactionSelector.Builder,
-            com.google.spanner.v1.TransactionSelectorOrBuilder>
+        com.google.spanner.v1.TransactionSelector,
+        com.google.spanner.v1.TransactionSelector.Builder,
+        com.google.spanner.v1.TransactionSelectorOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -2784,10 +2784,10 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
      * 
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionSelector,
-            com.google.spanner.v1.TransactionSelector.Builder,
-            com.google.spanner.v1.TransactionSelectorOrBuilder>
-        getTransactionFieldBuilder() {
+        com.google.spanner.v1.TransactionSelector,
+        com.google.spanner.v1.TransactionSelector.Builder,
+        com.google.spanner.v1.TransactionSelectorOrBuilder>
+    getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -2813,9 +2813,9 @@ private void ensureStatementsIsMutable() {
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.ExecuteBatchDmlRequest.Statement,
-            com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.Builder,
-            com.google.spanner.v1.ExecuteBatchDmlRequest.StatementOrBuilder>
+        com.google.spanner.v1.ExecuteBatchDmlRequest.Statement,
+        com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.Builder,
+        com.google.spanner.v1.ExecuteBatchDmlRequest.StatementOrBuilder>
         statementsBuilder_;
 
     /**
@@ -2834,7 +2834,7 @@ private void ensureStatementsIsMutable() {
      * 
      */
     public java.util.List
-        getStatementsList() {
+    getStatementsList() {
       if (statementsBuilder_ == null) {
         return java.util.Collections.unmodifiableList(statements_);
       } else {
@@ -3184,7 +3184,7 @@ public com.google.spanner.v1.ExecuteBatchDmlRequest.StatementOrBuilder getStatem
      * 
      */
     public java.util.List
-        getStatementsOrBuilderList() {
+    getStatementsOrBuilderList() {
       if (statementsBuilder_ != null) {
         return statementsBuilder_.getMessageOrBuilderList();
       } else {
@@ -3247,15 +3247,15 @@ public com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.Builder addStateme
      * 
      */
     public java.util.List
-        getStatementsBuilderList() {
+    getStatementsBuilderList() {
       return getStatementsFieldBuilder().getBuilderList();
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.ExecuteBatchDmlRequest.Statement,
-            com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.Builder,
-            com.google.spanner.v1.ExecuteBatchDmlRequest.StatementOrBuilder>
-        getStatementsFieldBuilder() {
+        com.google.spanner.v1.ExecuteBatchDmlRequest.Statement,
+        com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.Builder,
+        com.google.spanner.v1.ExecuteBatchDmlRequest.StatementOrBuilder>
+    getStatementsFieldBuilder() {
       if (statementsBuilder_ == null) {
         statementsBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -3340,9 +3340,9 @@ public Builder clearSeqno() {
 
     private com.google.spanner.v1.RequestOptions requestOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.RequestOptions,
-            com.google.spanner.v1.RequestOptions.Builder,
-            com.google.spanner.v1.RequestOptionsOrBuilder>
+        com.google.spanner.v1.RequestOptions,
+        com.google.spanner.v1.RequestOptions.Builder,
+        com.google.spanner.v1.RequestOptionsOrBuilder>
         requestOptionsBuilder_;
     /**
      *
@@ -3507,10 +3507,10 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder(
      * .google.spanner.v1.RequestOptions request_options = 5;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.RequestOptions,
-            com.google.spanner.v1.RequestOptions.Builder,
-            com.google.spanner.v1.RequestOptionsOrBuilder>
-        getRequestOptionsFieldBuilder() {
+        com.google.spanner.v1.RequestOptions,
+        com.google.spanner.v1.RequestOptions.Builder,
+        com.google.spanner.v1.RequestOptionsOrBuilder>
+    getRequestOptionsFieldBuilder() {
       if (requestOptionsBuilder_ == null) {
         requestOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -3572,4 +3572,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.spanner.v1.ExecuteBatchDmlRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-}
+}
\ No newline at end of file
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequestOrBuilder.java
index 8736410669..6fcd56732c 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface ExecuteBatchDmlRequestOrBuilder
    *
    * @return The session.
    */
-  java.lang.String getSession();
+  String getSession();
   /**
    *
    *
@@ -85,7 +85,7 @@ public interface ExecuteBatchDmlRequestOrBuilder
    *
    * @return The transaction.
    */
-  com.google.spanner.v1.TransactionSelector getTransaction();
+  TransactionSelector getTransaction();
   /**
    *
    *
@@ -100,7 +100,7 @@ public interface ExecuteBatchDmlRequestOrBuilder
    * .google.spanner.v1.TransactionSelector transaction = 2 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
-  com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder();
+  TransactionSelectorOrBuilder getTransactionOrBuilder();
 
   /**
    *
@@ -117,7 +117,7 @@ public interface ExecuteBatchDmlRequestOrBuilder
    * repeated .google.spanner.v1.ExecuteBatchDmlRequest.Statement statements = 3 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
-  java.util.List getStatementsList();
+  java.util.List getStatementsList();
   /**
    *
    *
@@ -133,7 +133,7 @@ public interface ExecuteBatchDmlRequestOrBuilder
    * repeated .google.spanner.v1.ExecuteBatchDmlRequest.Statement statements = 3 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
-  com.google.spanner.v1.ExecuteBatchDmlRequest.Statement getStatements(int index);
+  ExecuteBatchDmlRequest.Statement getStatements(int index);
   /**
    *
    *
@@ -165,8 +165,7 @@ public interface ExecuteBatchDmlRequestOrBuilder
    * repeated .google.spanner.v1.ExecuteBatchDmlRequest.Statement statements = 3 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
-  java.util.List
-      getStatementsOrBuilderList();
+  java.util.List getStatementsOrBuilderList();
   /**
    *
    *
@@ -182,7 +181,7 @@ public interface ExecuteBatchDmlRequestOrBuilder
    * repeated .google.spanner.v1.ExecuteBatchDmlRequest.Statement statements = 3 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
-  com.google.spanner.v1.ExecuteBatchDmlRequest.StatementOrBuilder getStatementsOrBuilder(int index);
+  ExecuteBatchDmlRequest.StatementOrBuilder getStatementsOrBuilder(int index);
 
   /**
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponse.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponse.java
index 814553409d..62b1a81ed3 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponse.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponse.java
@@ -58,13 +58,13 @@ private ExecuteBatchDmlResponse() {
     resultSets_ = java.util.Collections.emptyList();
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new ExecuteBatchDmlResponse();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -75,7 +75,7 @@ private ExecuteBatchDmlResponse(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -91,11 +91,10 @@ private ExecuteBatchDmlResponse(
           case 10:
             {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                resultSets_ = new java.util.ArrayList();
+                resultSets_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              resultSets_.add(
-                  input.readMessage(com.google.spanner.v1.ResultSet.parser(), extensionRegistry));
+              resultSets_.add(input.readMessage(ResultSet.parser(), extensionRegistry));
               break;
             }
           case 18:
@@ -135,22 +134,17 @@ private ExecuteBatchDmlResponse(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_ExecuteBatchDmlResponse_descriptor;
+    return SpannerProto.internal_static_google_spanner_v1_ExecuteBatchDmlResponse_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_ExecuteBatchDmlResponse_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.ExecuteBatchDmlResponse.class,
-            com.google.spanner.v1.ExecuteBatchDmlResponse.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return SpannerProto.internal_static_google_spanner_v1_ExecuteBatchDmlResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(ExecuteBatchDmlResponse.class, Builder.class);
   }
 
   public static final int RESULT_SETS_FIELD_NUMBER = 1;
-  private java.util.List resultSets_;
+  private java.util.List resultSets_;
   /**
    *
    *
@@ -165,8 +159,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  @java.lang.Override
-  public java.util.List getResultSetsList() {
+  @Override
+  public java.util.List getResultSetsList() {
     return resultSets_;
   }
   /**
@@ -183,9 +177,8 @@ public java.util.List getResultSetsList() {
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  @java.lang.Override
-  public java.util.List
-      getResultSetsOrBuilderList() {
+  @Override
+  public java.util.List getResultSetsOrBuilderList() {
     return resultSets_;
   }
   /**
@@ -202,7 +195,7 @@ public java.util.List getResultSetsList() {
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  @java.lang.Override
+  @Override
   public int getResultSetsCount() {
     return resultSets_.size();
   }
@@ -220,8 +213,8 @@ public int getResultSetsCount() {
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.ResultSet getResultSets(int index) {
+  @Override
+  public ResultSet getResultSets(int index) {
     return resultSets_.get(index);
   }
   /**
@@ -238,8 +231,8 @@ public com.google.spanner.v1.ResultSet getResultSets(int index) {
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.ResultSetOrBuilder getResultSetsOrBuilder(int index) {
+  @Override
+  public ResultSetOrBuilder getResultSetsOrBuilder(int index) {
     return resultSets_.get(index);
   }
 
@@ -257,7 +250,7 @@ public com.google.spanner.v1.ResultSetOrBuilder getResultSetsOrBuilder(int index
    *
    * @return Whether the status field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasStatus() {
     return status_ != null;
   }
@@ -273,7 +266,7 @@ public boolean hasStatus() {
    *
    * @return The status.
    */
-  @java.lang.Override
+  @Override
   public com.google.rpc.Status getStatus() {
     return status_ == null ? com.google.rpc.Status.getDefaultInstance() : status_;
   }
@@ -287,14 +280,14 @@ public com.google.rpc.Status getStatus() {
    *
    * .google.rpc.Status status = 2;
    */
-  @java.lang.Override
+  @Override
   public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
     return getStatus();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -304,7 +297,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < resultSets_.size(); i++) {
       output.writeMessage(1, resultSets_.get(i));
@@ -315,7 +308,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -332,16 +325,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.ExecuteBatchDmlResponse)) {
+    if (!(obj instanceof ExecuteBatchDmlResponse)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.ExecuteBatchDmlResponse other =
-        (com.google.spanner.v1.ExecuteBatchDmlResponse) obj;
+    ExecuteBatchDmlResponse other = (ExecuteBatchDmlResponse) obj;
 
     if (!getResultSetsList().equals(other.getResultSetsList())) return false;
     if (hasStatus() != other.hasStatus()) return false;
@@ -352,7 +344,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -372,71 +364,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(java.nio.ByteBuffer data)
+  public static ExecuteBatchDmlResponse parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(
+  public static ExecuteBatchDmlResponse parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(
-      com.google.protobuf.ByteString data)
+  public static ExecuteBatchDmlResponse parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(
+  public static ExecuteBatchDmlResponse 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.spanner.v1.ExecuteBatchDmlResponse parseFrom(byte[] data)
+  public static ExecuteBatchDmlResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(
+  public static ExecuteBatchDmlResponse parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(java.io.InputStream input)
+  public static ExecuteBatchDmlResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(
+  public static ExecuteBatchDmlResponse 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.spanner.v1.ExecuteBatchDmlResponse parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
+  public static ExecuteBatchDmlResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseDelimitedFrom(
+  public static ExecuteBatchDmlResponse 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.spanner.v1.ExecuteBatchDmlResponse parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static ExecuteBatchDmlResponse parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(
+  public static ExecuteBatchDmlResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -444,7 +435,7 @@ public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -453,17 +444,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.ExecuteBatchDmlResponse prototype) {
+  public static Builder newBuilder(ExecuteBatchDmlResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -496,20 +487,16 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.ExecuteBatchDmlResponse)
-      com.google.spanner.v1.ExecuteBatchDmlResponseOrBuilder {
+      ExecuteBatchDmlResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_ExecuteBatchDmlResponse_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_ExecuteBatchDmlResponse_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.SpannerProto
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return SpannerProto
           .internal_static_google_spanner_v1_ExecuteBatchDmlResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.ExecuteBatchDmlResponse.class,
-              com.google.spanner.v1.ExecuteBatchDmlResponse.Builder.class);
+          .ensureFieldAccessorsInitialized(ExecuteBatchDmlResponse.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.ExecuteBatchDmlResponse.newBuilder()
@@ -517,7 +504,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -528,7 +515,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       if (resultSetsBuilder_ == null) {
@@ -546,30 +533,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_ExecuteBatchDmlResponse_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_ExecuteBatchDmlResponse_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ExecuteBatchDmlResponse getDefaultInstanceForType() {
-      return com.google.spanner.v1.ExecuteBatchDmlResponse.getDefaultInstance();
+    @Override
+    public ExecuteBatchDmlResponse getDefaultInstanceForType() {
+      return ExecuteBatchDmlResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ExecuteBatchDmlResponse build() {
-      com.google.spanner.v1.ExecuteBatchDmlResponse result = buildPartial();
+    @Override
+    public ExecuteBatchDmlResponse build() {
+      ExecuteBatchDmlResponse result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ExecuteBatchDmlResponse buildPartial() {
-      com.google.spanner.v1.ExecuteBatchDmlResponse result =
-          new com.google.spanner.v1.ExecuteBatchDmlResponse(this);
+    @Override
+    public ExecuteBatchDmlResponse buildPartial() {
+      ExecuteBatchDmlResponse result = new ExecuteBatchDmlResponse(this);
       int from_bitField0_ = bitField0_;
       if (resultSetsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -589,51 +574,50 @@ public com.google.spanner.v1.ExecuteBatchDmlResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.ExecuteBatchDmlResponse) {
-        return mergeFrom((com.google.spanner.v1.ExecuteBatchDmlResponse) other);
+      if (other instanceof ExecuteBatchDmlResponse) {
+        return mergeFrom((ExecuteBatchDmlResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.ExecuteBatchDmlResponse other) {
-      if (other == com.google.spanner.v1.ExecuteBatchDmlResponse.getDefaultInstance()) return this;
+    public Builder mergeFrom(ExecuteBatchDmlResponse other) {
+      if (other == ExecuteBatchDmlResponse.getDefaultInstance()) return this;
       if (resultSetsBuilder_ == null) {
         if (!other.resultSets_.isEmpty()) {
           if (resultSets_.isEmpty()) {
@@ -669,21 +653,21 @@ public Builder mergeFrom(com.google.spanner.v1.ExecuteBatchDmlResponse other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.ExecuteBatchDmlResponse parsedMessage = null;
+      ExecuteBatchDmlResponse parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.ExecuteBatchDmlResponse) e.getUnfinishedMessage();
+        parsedMessage = (ExecuteBatchDmlResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -695,20 +679,17 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.util.List resultSets_ =
-        java.util.Collections.emptyList();
+    private java.util.List resultSets_ = java.util.Collections.emptyList();
 
     private void ensureResultSetsIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        resultSets_ = new java.util.ArrayList(resultSets_);
+        resultSets_ = new java.util.ArrayList(resultSets_);
         bitField0_ |= 0x00000001;
       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.ResultSet,
-            com.google.spanner.v1.ResultSet.Builder,
-            com.google.spanner.v1.ResultSetOrBuilder>
+            ResultSet, ResultSet.Builder, ResultSetOrBuilder>
         resultSetsBuilder_;
 
     /**
@@ -725,7 +706,7 @@ private void ensureResultSetsIsMutable() {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public java.util.List getResultSetsList() {
+    public java.util.List getResultSetsList() {
       if (resultSetsBuilder_ == null) {
         return java.util.Collections.unmodifiableList(resultSets_);
       } else {
@@ -767,7 +748,7 @@ public int getResultSetsCount() {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public com.google.spanner.v1.ResultSet getResultSets(int index) {
+    public ResultSet getResultSets(int index) {
       if (resultSetsBuilder_ == null) {
         return resultSets_.get(index);
       } else {
@@ -788,7 +769,7 @@ public com.google.spanner.v1.ResultSet getResultSets(int index) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder setResultSets(int index, com.google.spanner.v1.ResultSet value) {
+    public Builder setResultSets(int index, ResultSet value) {
       if (resultSetsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -815,8 +796,7 @@ public Builder setResultSets(int index, com.google.spanner.v1.ResultSet value) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder setResultSets(
-        int index, com.google.spanner.v1.ResultSet.Builder builderForValue) {
+    public Builder setResultSets(int index, ResultSet.Builder builderForValue) {
       if (resultSetsBuilder_ == null) {
         ensureResultSetsIsMutable();
         resultSets_.set(index, builderForValue.build());
@@ -840,7 +820,7 @@ public Builder setResultSets(
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder addResultSets(com.google.spanner.v1.ResultSet value) {
+    public Builder addResultSets(ResultSet value) {
       if (resultSetsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -867,7 +847,7 @@ public Builder addResultSets(com.google.spanner.v1.ResultSet value) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder addResultSets(int index, com.google.spanner.v1.ResultSet value) {
+    public Builder addResultSets(int index, ResultSet value) {
       if (resultSetsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -894,7 +874,7 @@ public Builder addResultSets(int index, com.google.spanner.v1.ResultSet value) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder addResultSets(com.google.spanner.v1.ResultSet.Builder builderForValue) {
+    public Builder addResultSets(ResultSet.Builder builderForValue) {
       if (resultSetsBuilder_ == null) {
         ensureResultSetsIsMutable();
         resultSets_.add(builderForValue.build());
@@ -918,8 +898,7 @@ public Builder addResultSets(com.google.spanner.v1.ResultSet.Builder builderForV
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder addResultSets(
-        int index, com.google.spanner.v1.ResultSet.Builder builderForValue) {
+    public Builder addResultSets(int index, ResultSet.Builder builderForValue) {
       if (resultSetsBuilder_ == null) {
         ensureResultSetsIsMutable();
         resultSets_.add(index, builderForValue.build());
@@ -943,8 +922,7 @@ public Builder addResultSets(
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder addAllResultSets(
-        java.lang.Iterable values) {
+    public Builder addAllResultSets(Iterable values) {
       if (resultSetsBuilder_ == null) {
         ensureResultSetsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, resultSets_);
@@ -1016,7 +994,7 @@ public Builder removeResultSets(int index) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public com.google.spanner.v1.ResultSet.Builder getResultSetsBuilder(int index) {
+    public ResultSet.Builder getResultSetsBuilder(int index) {
       return getResultSetsFieldBuilder().getBuilder(index);
     }
     /**
@@ -1033,7 +1011,7 @@ public com.google.spanner.v1.ResultSet.Builder getResultSetsBuilder(int index) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public com.google.spanner.v1.ResultSetOrBuilder getResultSetsOrBuilder(int index) {
+    public ResultSetOrBuilder getResultSetsOrBuilder(int index) {
       if (resultSetsBuilder_ == null) {
         return resultSets_.get(index);
       } else {
@@ -1054,8 +1032,7 @@ public com.google.spanner.v1.ResultSetOrBuilder getResultSetsOrBuilder(int index
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public java.util.List
-        getResultSetsOrBuilderList() {
+    public java.util.List getResultSetsOrBuilderList() {
       if (resultSetsBuilder_ != null) {
         return resultSetsBuilder_.getMessageOrBuilderList();
       } else {
@@ -1076,9 +1053,8 @@ public com.google.spanner.v1.ResultSetOrBuilder getResultSetsOrBuilder(int index
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public com.google.spanner.v1.ResultSet.Builder addResultSetsBuilder() {
-      return getResultSetsFieldBuilder()
-          .addBuilder(com.google.spanner.v1.ResultSet.getDefaultInstance());
+    public ResultSet.Builder addResultSetsBuilder() {
+      return getResultSetsFieldBuilder().addBuilder(ResultSet.getDefaultInstance());
     }
     /**
      *
@@ -1094,9 +1070,8 @@ public com.google.spanner.v1.ResultSet.Builder addResultSetsBuilder() {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public com.google.spanner.v1.ResultSet.Builder addResultSetsBuilder(int index) {
-      return getResultSetsFieldBuilder()
-          .addBuilder(index, com.google.spanner.v1.ResultSet.getDefaultInstance());
+    public ResultSet.Builder addResultSetsBuilder(int index) {
+      return getResultSetsFieldBuilder().addBuilder(index, ResultSet.getDefaultInstance());
     }
     /**
      *
@@ -1112,21 +1087,17 @@ public com.google.spanner.v1.ResultSet.Builder addResultSetsBuilder(int index) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public java.util.List getResultSetsBuilderList() {
+    public java.util.List getResultSetsBuilderList() {
       return getResultSetsFieldBuilder().getBuilderList();
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.ResultSet,
-            com.google.spanner.v1.ResultSet.Builder,
-            com.google.spanner.v1.ResultSetOrBuilder>
+            ResultSet, ResultSet.Builder, ResultSetOrBuilder>
         getResultSetsFieldBuilder() {
       if (resultSetsBuilder_ == null) {
         resultSetsBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.spanner.v1.ResultSet,
-                com.google.spanner.v1.ResultSet.Builder,
-                com.google.spanner.v1.ResultSetOrBuilder>(
+                ResultSet, ResultSet.Builder, ResultSetOrBuilder>(
                 resultSets_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         resultSets_ = null;
       }
@@ -1315,12 +1286,12 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
       return statusBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1330,19 +1301,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.ExecuteBatchDmlResponse)
-  private static final com.google.spanner.v1.ExecuteBatchDmlResponse DEFAULT_INSTANCE;
+  private static final ExecuteBatchDmlResponse DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.ExecuteBatchDmlResponse();
+    DEFAULT_INSTANCE = new ExecuteBatchDmlResponse();
   }
 
-  public static com.google.spanner.v1.ExecuteBatchDmlResponse getDefaultInstance() {
+  public static ExecuteBatchDmlResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public ExecuteBatchDmlResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1355,13 +1326,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.ExecuteBatchDmlResponse getDefaultInstanceForType() {
+  @Override
+  public ExecuteBatchDmlResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponseOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponseOrBuilder.java
index b2891c067a..32f813fdd7 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponseOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponseOrBuilder.java
@@ -37,7 +37,7 @@ public interface ExecuteBatchDmlResponseOrBuilder
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  java.util.List getResultSetsList();
+  java.util.List getResultSetsList();
   /**
    *
    *
@@ -52,7 +52,7 @@ public interface ExecuteBatchDmlResponseOrBuilder
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  com.google.spanner.v1.ResultSet getResultSets(int index);
+  ResultSet getResultSets(int index);
   /**
    *
    *
@@ -82,7 +82,7 @@ public interface ExecuteBatchDmlResponseOrBuilder
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  java.util.List getResultSetsOrBuilderList();
+  java.util.List getResultSetsOrBuilderList();
   /**
    *
    *
@@ -97,7 +97,7 @@ public interface ExecuteBatchDmlResponseOrBuilder
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  com.google.spanner.v1.ResultSetOrBuilder getResultSetsOrBuilder(int index);
+  ResultSetOrBuilder getResultSetsOrBuilder(int index);
 
   /**
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java
index 74b7d7aa2e..a3f9dbc868 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java
@@ -77,127 +77,127 @@ private ExecuteSqlRequest(
             done = true;
             break;
           case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+          {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              session_ = s;
-              break;
-            }
+            session_ = s;
+            break;
+          }
           case 18:
-            {
-              com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
-              if (transaction_ != null) {
-                subBuilder = transaction_.toBuilder();
-              }
-              transaction_ =
-                  input.readMessage(
-                      com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(transaction_);
-                transaction_ = subBuilder.buildPartial();
-              }
-
-              break;
+          {
+            com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
+            if (transaction_ != null) {
+              subBuilder = transaction_.toBuilder();
+            }
+            transaction_ =
+                input.readMessage(
+                    com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(transaction_);
+              transaction_ = subBuilder.buildPartial();
             }
+
+            break;
+          }
           case 26:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+          {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              sql_ = s;
-              break;
-            }
+            sql_ = s;
+            break;
+          }
           case 34:
-            {
-              com.google.protobuf.Struct.Builder subBuilder = null;
-              if (params_ != null) {
-                subBuilder = params_.toBuilder();
-              }
-              params_ = input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(params_);
-                params_ = subBuilder.buildPartial();
-              }
-
-              break;
+          {
+            com.google.protobuf.Struct.Builder subBuilder = null;
+            if (params_ != null) {
+              subBuilder = params_.toBuilder();
+            }
+            params_ = input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(params_);
+              params_ = subBuilder.buildPartial();
             }
+
+            break;
+          }
           case 42:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                paramTypes_ =
-                    com.google.protobuf.MapField.newMapField(
-                        ParamTypesDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
-              }
-              com.google.protobuf.MapEntry
-                  paramTypes__ =
-                      input.readMessage(
-                          ParamTypesDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-              paramTypes_.getMutableMap().put(paramTypes__.getKey(), paramTypes__.getValue());
-              break;
+          {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              paramTypes_ =
+                  com.google.protobuf.MapField.newMapField(
+                      ParamTypesDefaultEntryHolder.defaultEntry);
+              mutable_bitField0_ |= 0x00000001;
             }
+            com.google.protobuf.MapEntry
+                paramTypes__ =
+                input.readMessage(
+                    ParamTypesDefaultEntryHolder.defaultEntry.getParserForType(),
+                    extensionRegistry);
+            paramTypes_.getMutableMap().put(paramTypes__.getKey(), paramTypes__.getValue());
+            break;
+          }
           case 50:
-            {
-              resumeToken_ = input.readBytes();
-              break;
-            }
+          {
+            resumeToken_ = input.readBytes();
+            break;
+          }
           case 56:
-            {
-              int rawValue = input.readEnum();
+          {
+            int rawValue = input.readEnum();
 
-              queryMode_ = rawValue;
-              break;
-            }
+            queryMode_ = rawValue;
+            break;
+          }
           case 66:
-            {
-              partitionToken_ = input.readBytes();
-              break;
-            }
+          {
+            partitionToken_ = input.readBytes();
+            break;
+          }
           case 72:
-            {
-              seqno_ = input.readInt64();
-              break;
-            }
+          {
+            seqno_ = input.readInt64();
+            break;
+          }
           case 82:
-            {
-              com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder subBuilder = null;
-              if (queryOptions_ != null) {
-                subBuilder = queryOptions_.toBuilder();
-              }
-              queryOptions_ =
-                  input.readMessage(
-                      com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.parser(),
-                      extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(queryOptions_);
-                queryOptions_ = subBuilder.buildPartial();
-              }
-
-              break;
+          {
+            com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder subBuilder = null;
+            if (queryOptions_ != null) {
+              subBuilder = queryOptions_.toBuilder();
+            }
+            queryOptions_ =
+                input.readMessage(
+                    com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.parser(),
+                    extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(queryOptions_);
+              queryOptions_ = subBuilder.buildPartial();
             }
-          case 90:
-            {
-              com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
-              if (requestOptions_ != null) {
-                subBuilder = requestOptions_.toBuilder();
-              }
-              requestOptions_ =
-                  input.readMessage(
-                      com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(requestOptions_);
-                requestOptions_ = subBuilder.buildPartial();
-              }
 
-              break;
+            break;
+          }
+          case 90:
+          {
+            com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
+            if (requestOptions_ != null) {
+              subBuilder = requestOptions_.toBuilder();
+            }
+            requestOptions_ =
+                input.readMessage(
+                    com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(requestOptions_);
+              requestOptions_ = subBuilder.buildPartial();
             }
+
+            break;
+          }
           default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+          {
+            if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -228,7 +228,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
+  internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto
         .internal_static_google_spanner_v1_ExecuteSqlRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
@@ -570,26 +570,26 @@ private QueryOptions(
               done = true;
               break;
             case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-                optimizerVersion_ = s;
-                break;
-              }
+              optimizerVersion_ = s;
+              break;
+            }
             case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-                optimizerStatisticsPackage_ = s;
-                break;
-              }
+              optimizerStatisticsPackage_ = s;
+              break;
+            }
             default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
               }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -609,7 +609,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
+    internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_ExecuteSqlRequest_QueryOptions_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -973,7 +973,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
+      internalGetFieldAccessorTable() {
         return com.google.spanner.v1.SpannerProto
             .internal_static_google_spanner_v1_ExecuteSqlRequest_QueryOptions_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1788,20 +1788,20 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
   private static final class ParamTypesDefaultEntryHolder {
     static final com.google.protobuf.MapEntry
         defaultEntry =
-            com.google.protobuf.MapEntry
-                .newDefaultInstance(
-                    com.google.spanner.v1.SpannerProto
-                        .internal_static_google_spanner_v1_ExecuteSqlRequest_ParamTypesEntry_descriptor,
-                    com.google.protobuf.WireFormat.FieldType.STRING,
-                    "",
-                    com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                    com.google.spanner.v1.Type.getDefaultInstance());
+        com.google.protobuf.MapEntry
+            .newDefaultInstance(
+                com.google.spanner.v1.SpannerProto
+                    .internal_static_google_spanner_v1_ExecuteSqlRequest_ParamTypesEntry_descriptor,
+                com.google.protobuf.WireFormat.FieldType.STRING,
+                "",
+                com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                com.google.spanner.v1.Type.getDefaultInstance());
   }
 
   private com.google.protobuf.MapField paramTypes_;
 
   private com.google.protobuf.MapField
-      internalGetParamTypes() {
+  internalGetParamTypes() {
     if (paramTypes_ == null) {
       return com.google.protobuf.MapField.emptyMapField(ParamTypesDefaultEntryHolder.defaultEntry);
     }
@@ -2433,7 +2433,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
+    internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_ExecuteSqlRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -2782,9 +2782,9 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
 
     private com.google.spanner.v1.TransactionSelector transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionSelector,
-            com.google.spanner.v1.TransactionSelector.Builder,
-            com.google.spanner.v1.TransactionSelectorOrBuilder>
+        com.google.spanner.v1.TransactionSelector,
+        com.google.spanner.v1.TransactionSelector.Builder,
+        com.google.spanner.v1.TransactionSelectorOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -3004,10 +3004,10 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionSelector,
-            com.google.spanner.v1.TransactionSelector.Builder,
-            com.google.spanner.v1.TransactionSelectorOrBuilder>
-        getTransactionFieldBuilder() {
+        com.google.spanner.v1.TransactionSelector,
+        com.google.spanner.v1.TransactionSelector.Builder,
+        com.google.spanner.v1.TransactionSelectorOrBuilder>
+    getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -3128,9 +3128,9 @@ public Builder setSqlBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.Struct params_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Struct,
-            com.google.protobuf.Struct.Builder,
-            com.google.protobuf.StructOrBuilder>
+        com.google.protobuf.Struct,
+        com.google.protobuf.Struct.Builder,
+        com.google.protobuf.StructOrBuilder>
         paramsBuilder_;
     /**
      *
@@ -3360,10 +3360,10 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
      * .google.protobuf.Struct params = 4;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Struct,
-            com.google.protobuf.Struct.Builder,
-            com.google.protobuf.StructOrBuilder>
-        getParamsFieldBuilder() {
+        com.google.protobuf.Struct,
+        com.google.protobuf.Struct.Builder,
+        com.google.protobuf.StructOrBuilder>
+    getParamsFieldBuilder() {
       if (paramsBuilder_ == null) {
         paramsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -3379,7 +3379,7 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
     private com.google.protobuf.MapField paramTypes_;
 
     private com.google.protobuf.MapField
-        internalGetParamTypes() {
+    internalGetParamTypes() {
       if (paramTypes_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             ParamTypesDefaultEntryHolder.defaultEntry);
@@ -3388,7 +3388,7 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
     }
 
     private com.google.protobuf.MapField
-        internalGetMutableParamTypes() {
+    internalGetMutableParamTypes() {
       onChanged();
       ;
       if (paramTypes_ == null) {
@@ -3893,9 +3893,9 @@ public Builder clearSeqno() {
 
     private com.google.spanner.v1.ExecuteSqlRequest.QueryOptions queryOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.ExecuteSqlRequest.QueryOptions,
-            com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder,
-            com.google.spanner.v1.ExecuteSqlRequest.QueryOptionsOrBuilder>
+        com.google.spanner.v1.ExecuteSqlRequest.QueryOptions,
+        com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder,
+        com.google.spanner.v1.ExecuteSqlRequest.QueryOptionsOrBuilder>
         queryOptionsBuilder_;
     /**
      *
@@ -4043,7 +4043,7 @@ public com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder getQueryOpti
      * .google.spanner.v1.ExecuteSqlRequest.QueryOptions query_options = 10;
      */
     public com.google.spanner.v1.ExecuteSqlRequest.QueryOptionsOrBuilder
-        getQueryOptionsOrBuilder() {
+    getQueryOptionsOrBuilder() {
       if (queryOptionsBuilder_ != null) {
         return queryOptionsBuilder_.getMessageOrBuilder();
       } else {
@@ -4062,10 +4062,10 @@ public com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder getQueryOpti
      * .google.spanner.v1.ExecuteSqlRequest.QueryOptions query_options = 10;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.ExecuteSqlRequest.QueryOptions,
-            com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder,
-            com.google.spanner.v1.ExecuteSqlRequest.QueryOptionsOrBuilder>
-        getQueryOptionsFieldBuilder() {
+        com.google.spanner.v1.ExecuteSqlRequest.QueryOptions,
+        com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder,
+        com.google.spanner.v1.ExecuteSqlRequest.QueryOptionsOrBuilder>
+    getQueryOptionsFieldBuilder() {
       if (queryOptionsBuilder_ == null) {
         queryOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -4080,9 +4080,9 @@ public com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder getQueryOpti
 
     private com.google.spanner.v1.RequestOptions requestOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.RequestOptions,
-            com.google.spanner.v1.RequestOptions.Builder,
-            com.google.spanner.v1.RequestOptionsOrBuilder>
+        com.google.spanner.v1.RequestOptions,
+        com.google.spanner.v1.RequestOptions.Builder,
+        com.google.spanner.v1.RequestOptionsOrBuilder>
         requestOptionsBuilder_;
     /**
      *
@@ -4247,10 +4247,10 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder(
      * .google.spanner.v1.RequestOptions request_options = 11;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.RequestOptions,
-            com.google.spanner.v1.RequestOptions.Builder,
-            com.google.spanner.v1.RequestOptionsOrBuilder>
-        getRequestOptionsFieldBuilder() {
+        com.google.spanner.v1.RequestOptions,
+        com.google.spanner.v1.RequestOptions.Builder,
+        com.google.spanner.v1.RequestOptionsOrBuilder>
+    getRequestOptionsFieldBuilder() {
       if (requestOptionsBuilder_ == null) {
         requestOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -4312,4 +4312,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.spanner.v1.ExecuteSqlRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-}
+}
\ No newline at end of file
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequestOrBuilder.java
index 869777efc0..44839300d3 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * @return The session.
    */
-  java.lang.String getSession();
+  String getSession();
   /**
    *
    *
@@ -87,7 +87,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * @return The transaction.
    */
-  com.google.spanner.v1.TransactionSelector getTransaction();
+  TransactionSelector getTransaction();
   /**
    *
    *
@@ -103,7 +103,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * .google.spanner.v1.TransactionSelector transaction = 2;
    */
-  com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder();
+  TransactionSelectorOrBuilder getTransactionOrBuilder();
 
   /**
    *
@@ -116,7 +116,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * @return The sql.
    */
-  java.lang.String getSql();
+  String getSql();
   /**
    *
    *
@@ -220,10 +220,10 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  boolean containsParamTypes(java.lang.String key);
+  boolean containsParamTypes(String key);
   /** Use {@link #getParamTypesMap()} instead. */
-  @java.lang.Deprecated
-  java.util.Map getParamTypes();
+  @Deprecated
+  java.util.Map getParamTypes();
   /**
    *
    *
@@ -239,7 +239,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  java.util.Map getParamTypesMap();
+  java.util.Map getParamTypesMap();
   /**
    *
    *
@@ -255,8 +255,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  com.google.spanner.v1.Type getParamTypesOrDefault(
-      java.lang.String key, com.google.spanner.v1.Type defaultValue);
+  Type getParamTypesOrDefault(String key, Type defaultValue);
   /**
    *
    *
@@ -272,7 +271,7 @@ com.google.spanner.v1.Type getParamTypesOrDefault(
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  com.google.spanner.v1.Type getParamTypesOrThrow(java.lang.String key);
+  Type getParamTypesOrThrow(String key);
 
   /**
    *
@@ -319,7 +318,7 @@ com.google.spanner.v1.Type getParamTypesOrDefault(
    *
    * @return The queryMode.
    */
-  com.google.spanner.v1.ExecuteSqlRequest.QueryMode getQueryMode();
+  ExecuteSqlRequest.QueryMode getQueryMode();
 
   /**
    *
@@ -380,7 +379,7 @@ com.google.spanner.v1.Type getParamTypesOrDefault(
    *
    * @return The queryOptions.
    */
-  com.google.spanner.v1.ExecuteSqlRequest.QueryOptions getQueryOptions();
+  ExecuteSqlRequest.QueryOptions getQueryOptions();
   /**
    *
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java
index e8c23cb150..bc2e223383 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java
@@ -41,13 +41,13 @@ private GetSessionRequest() {
     name_ = "";
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new GetSessionRequest();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private GetSessionRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -72,7 +72,7 @@ private GetSessionRequest(
             break;
           case 10:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               name_ = s;
               break;
@@ -97,22 +97,17 @@ private GetSessionRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_GetSessionRequest_descriptor;
+    return SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_GetSessionRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.GetSessionRequest.class,
-            com.google.spanner.v1.GetSessionRequest.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(GetSessionRequest.class, Builder.class);
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+  private volatile Object name_;
   /**
    *
    *
@@ -126,14 +121,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The name.
    */
-  @java.lang.Override
-  public java.lang.String getName() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getName() {
+    Object ref = name_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       name_ = s;
       return s;
     }
@@ -151,12 +146,11 @@ public java.lang.String getName() {
    *
    * @return The bytes for name.
    */
-  @java.lang.Override
+  @Override
   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);
+    Object ref = name_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       name_ = b;
       return b;
     } else {
@@ -166,7 +160,7 @@ public com.google.protobuf.ByteString getNameBytes() {
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -176,7 +170,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
@@ -184,7 +178,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -198,22 +192,22 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.GetSessionRequest)) {
+    if (!(obj instanceof GetSessionRequest)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.GetSessionRequest other = (com.google.spanner.v1.GetSessionRequest) obj;
+    GetSessionRequest other = (GetSessionRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -227,71 +221,69 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.GetSessionRequest parseFrom(java.nio.ByteBuffer data)
+  public static GetSessionRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.GetSessionRequest parseFrom(
+  public static GetSessionRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.GetSessionRequest parseFrom(
-      com.google.protobuf.ByteString data)
+  public static GetSessionRequest parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.GetSessionRequest parseFrom(
+  public static GetSessionRequest 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.spanner.v1.GetSessionRequest parseFrom(byte[] data)
+  public static GetSessionRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.GetSessionRequest parseFrom(
+  public static GetSessionRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.GetSessionRequest parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static GetSessionRequest parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.GetSessionRequest parseFrom(
+  public static GetSessionRequest 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.spanner.v1.GetSessionRequest parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
+  public static GetSessionRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.GetSessionRequest parseDelimitedFrom(
+  public static GetSessionRequest 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.spanner.v1.GetSessionRequest parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static GetSessionRequest parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.GetSessionRequest parseFrom(
+  public static GetSessionRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -299,7 +291,7 @@ public static com.google.spanner.v1.GetSessionRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -308,17 +300,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.GetSessionRequest prototype) {
+  public static Builder newBuilder(GetSessionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -334,20 +326,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.GetSessionRequest)
-      com.google.spanner.v1.GetSessionRequestOrBuilder {
+      GetSessionRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_GetSessionRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_GetSessionRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.GetSessionRequest.class,
-              com.google.spanner.v1.GetSessionRequest.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(GetSessionRequest.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.GetSessionRequest.newBuilder()
@@ -355,7 +342,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -364,7 +351,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -372,80 +359,77 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_GetSessionRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.GetSessionRequest getDefaultInstanceForType() {
-      return com.google.spanner.v1.GetSessionRequest.getDefaultInstance();
+    @Override
+    public GetSessionRequest getDefaultInstanceForType() {
+      return GetSessionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.GetSessionRequest build() {
-      com.google.spanner.v1.GetSessionRequest result = buildPartial();
+    @Override
+    public GetSessionRequest build() {
+      GetSessionRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.GetSessionRequest buildPartial() {
-      com.google.spanner.v1.GetSessionRequest result =
-          new com.google.spanner.v1.GetSessionRequest(this);
+    @Override
+    public GetSessionRequest buildPartial() {
+      GetSessionRequest result = new GetSessionRequest(this);
       result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.GetSessionRequest) {
-        return mergeFrom((com.google.spanner.v1.GetSessionRequest) other);
+      if (other instanceof GetSessionRequest) {
+        return mergeFrom((GetSessionRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.GetSessionRequest other) {
-      if (other == com.google.spanner.v1.GetSessionRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(GetSessionRequest other) {
+      if (other == GetSessionRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
         onChanged();
@@ -455,21 +439,21 @@ public Builder mergeFrom(com.google.spanner.v1.GetSessionRequest other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.GetSessionRequest parsedMessage = null;
+      GetSessionRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.GetSessionRequest) e.getUnfinishedMessage();
+        parsedMessage = (GetSessionRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -479,7 +463,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private java.lang.Object name_ = "";
+    private Object name_ = "";
     /**
      *
      *
@@ -493,15 +477,15 @@ public Builder mergeFrom(
      *
      * @return The name.
      */
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getName() {
+      Object ref = name_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         name_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -518,10 +502,10 @@ public java.lang.String getName() {
      * @return The bytes for name.
      */
     public com.google.protobuf.ByteString getNameBytes() {
-      java.lang.Object ref = name_;
+      Object ref = name_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         name_ = b;
         return b;
       } else {
@@ -542,7 +526,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      * @param value The name to set.
      * @return This builder for chaining.
      */
-    public Builder setName(java.lang.String value) {
+    public Builder setName(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -595,12 +579,12 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -610,19 +594,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.GetSessionRequest)
-  private static final com.google.spanner.v1.GetSessionRequest DEFAULT_INSTANCE;
+  private static final GetSessionRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.GetSessionRequest();
+    DEFAULT_INSTANCE = new GetSessionRequest();
   }
 
-  public static com.google.spanner.v1.GetSessionRequest getDefaultInstance() {
+  public static GetSessionRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public GetSessionRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -635,13 +619,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.GetSessionRequest getDefaultInstanceForType() {
+  @Override
+  public GetSessionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequestOrBuilder.java
index 811caaed11..3ca7b53c69 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface GetSessionRequestOrBuilder
    *
    * @return The name.
    */
-  java.lang.String getName();
+  String getName();
   /**
    *
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java
index 31eeafed84..fecb675217 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java
@@ -99,13 +99,13 @@ private KeyRange(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
   private KeyRange() {}
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new KeyRange();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -116,7 +116,7 @@ private KeyRange(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -208,25 +208,19 @@ private KeyRange(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
+    return KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.KeysProto
-        .internal_static_google_spanner_v1_KeyRange_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.KeyRange.class, com.google.spanner.v1.KeyRange.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return KeysProto.internal_static_google_spanner_v1_KeyRange_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(KeyRange.class, Builder.class);
   }
 
   private int startKeyTypeCase_ = 0;
-  private java.lang.Object startKeyType_;
+  private Object startKeyType_;
 
-  public enum StartKeyTypeCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
-          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+  public enum StartKeyTypeCase implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
     START_CLOSED(1),
     START_OPEN(2),
     STARTKEYTYPE_NOT_SET(0);
@@ -240,7 +234,7 @@ private StartKeyTypeCase(int value) {
      * @return The enum associated with the given number.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @java.lang.Deprecated
+    @Deprecated
     public static StartKeyTypeCase valueOf(int value) {
       return forNumber(value);
     }
@@ -268,12 +262,9 @@ public StartKeyTypeCase getStartKeyTypeCase() {
   }
 
   private int endKeyTypeCase_ = 0;
-  private java.lang.Object endKeyType_;
+  private Object endKeyType_;
 
-  public enum EndKeyTypeCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
-          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+  public enum EndKeyTypeCase implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
     END_CLOSED(3),
     END_OPEN(4),
     ENDKEYTYPE_NOT_SET(0);
@@ -287,7 +278,7 @@ private EndKeyTypeCase(int value) {
      * @return The enum associated with the given number.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @java.lang.Deprecated
+    @Deprecated
     public static EndKeyTypeCase valueOf(int value) {
       return forNumber(value);
     }
@@ -327,7 +318,7 @@ public EndKeyTypeCase getEndKeyTypeCase() {
    *
    * @return Whether the startClosed field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasStartClosed() {
     return startKeyTypeCase_ == 1;
   }
@@ -343,7 +334,7 @@ public boolean hasStartClosed() {
    *
    * @return The startClosed.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ListValue getStartClosed() {
     if (startKeyTypeCase_ == 1) {
       return (com.google.protobuf.ListValue) startKeyType_;
@@ -360,7 +351,7 @@ public com.google.protobuf.ListValue getStartClosed() {
    *
    * .google.protobuf.ListValue start_closed = 1;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ListValueOrBuilder getStartClosedOrBuilder() {
     if (startKeyTypeCase_ == 1) {
       return (com.google.protobuf.ListValue) startKeyType_;
@@ -381,7 +372,7 @@ public com.google.protobuf.ListValueOrBuilder getStartClosedOrBuilder() {
    *
    * @return Whether the startOpen field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasStartOpen() {
     return startKeyTypeCase_ == 2;
   }
@@ -397,7 +388,7 @@ public boolean hasStartOpen() {
    *
    * @return The startOpen.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ListValue getStartOpen() {
     if (startKeyTypeCase_ == 2) {
       return (com.google.protobuf.ListValue) startKeyType_;
@@ -414,7 +405,7 @@ public com.google.protobuf.ListValue getStartOpen() {
    *
    * .google.protobuf.ListValue start_open = 2;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ListValueOrBuilder getStartOpenOrBuilder() {
     if (startKeyTypeCase_ == 2) {
       return (com.google.protobuf.ListValue) startKeyType_;
@@ -435,7 +426,7 @@ public com.google.protobuf.ListValueOrBuilder getStartOpenOrBuilder() {
    *
    * @return Whether the endClosed field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasEndClosed() {
     return endKeyTypeCase_ == 3;
   }
@@ -451,7 +442,7 @@ public boolean hasEndClosed() {
    *
    * @return The endClosed.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ListValue getEndClosed() {
     if (endKeyTypeCase_ == 3) {
       return (com.google.protobuf.ListValue) endKeyType_;
@@ -468,7 +459,7 @@ public com.google.protobuf.ListValue getEndClosed() {
    *
    * .google.protobuf.ListValue end_closed = 3;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ListValueOrBuilder getEndClosedOrBuilder() {
     if (endKeyTypeCase_ == 3) {
       return (com.google.protobuf.ListValue) endKeyType_;
@@ -489,7 +480,7 @@ public com.google.protobuf.ListValueOrBuilder getEndClosedOrBuilder() {
    *
    * @return Whether the endOpen field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasEndOpen() {
     return endKeyTypeCase_ == 4;
   }
@@ -505,7 +496,7 @@ public boolean hasEndOpen() {
    *
    * @return The endOpen.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ListValue getEndOpen() {
     if (endKeyTypeCase_ == 4) {
       return (com.google.protobuf.ListValue) endKeyType_;
@@ -522,7 +513,7 @@ public com.google.protobuf.ListValue getEndOpen() {
    *
    * .google.protobuf.ListValue end_open = 4;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ListValueOrBuilder getEndOpenOrBuilder() {
     if (endKeyTypeCase_ == 4) {
       return (com.google.protobuf.ListValue) endKeyType_;
@@ -532,7 +523,7 @@ public com.google.protobuf.ListValueOrBuilder getEndOpenOrBuilder() {
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -542,7 +533,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (startKeyTypeCase_ == 1) {
       output.writeMessage(1, (com.google.protobuf.ListValue) startKeyType_);
@@ -559,7 +550,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -590,15 +581,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.KeyRange)) {
+    if (!(obj instanceof KeyRange)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.KeyRange other = (com.google.spanner.v1.KeyRange) obj;
+    KeyRange other = (KeyRange) obj;
 
     if (!getStartKeyTypeCase().equals(other.getStartKeyTypeCase())) return false;
     switch (startKeyTypeCase_) {
@@ -626,7 +617,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -662,70 +653,68 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.KeyRange parseFrom(java.nio.ByteBuffer data)
+  public static KeyRange parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.KeyRange parseFrom(
+  public static KeyRange parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.KeyRange parseFrom(com.google.protobuf.ByteString data)
+  public static KeyRange parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.KeyRange parseFrom(
+  public static KeyRange 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.spanner.v1.KeyRange parseFrom(byte[] data)
+  public static KeyRange parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.KeyRange parseFrom(
+  public static KeyRange parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.KeyRange parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static KeyRange parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.KeyRange parseFrom(
+  public static KeyRange 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.spanner.v1.KeyRange parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static KeyRange parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.KeyRange parseDelimitedFrom(
+  public static KeyRange 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.spanner.v1.KeyRange parseFrom(com.google.protobuf.CodedInputStream input)
+  public static KeyRange parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.KeyRange parseFrom(
+  public static KeyRange parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -733,7 +722,7 @@ public static com.google.spanner.v1.KeyRange parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -742,17 +731,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.KeyRange prototype) {
+  public static Builder newBuilder(KeyRange prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -828,18 +817,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.KeyRange)
-      com.google.spanner.v1.KeyRangeOrBuilder {
+      KeyRangeOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
+      return KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.KeysProto
-          .internal_static_google_spanner_v1_KeyRange_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.KeyRange.class, com.google.spanner.v1.KeyRange.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return KeysProto.internal_static_google_spanner_v1_KeyRange_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(KeyRange.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.KeyRange.newBuilder()
@@ -847,7 +833,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -856,7 +842,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       startKeyTypeCase_ = 0;
@@ -866,28 +852,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
+      return KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.KeyRange getDefaultInstanceForType() {
-      return com.google.spanner.v1.KeyRange.getDefaultInstance();
+    @Override
+    public KeyRange getDefaultInstanceForType() {
+      return KeyRange.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.KeyRange build() {
-      com.google.spanner.v1.KeyRange result = buildPartial();
+    @Override
+    public KeyRange build() {
+      KeyRange result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.KeyRange buildPartial() {
-      com.google.spanner.v1.KeyRange result = new com.google.spanner.v1.KeyRange(this);
+    @Override
+    public KeyRange buildPartial() {
+      KeyRange result = new KeyRange(this);
       if (startKeyTypeCase_ == 1) {
         if (startClosedBuilder_ == null) {
           result.startKeyType_ = startKeyType_;
@@ -922,51 +908,50 @@ public com.google.spanner.v1.KeyRange buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.KeyRange) {
-        return mergeFrom((com.google.spanner.v1.KeyRange) other);
+      if (other instanceof KeyRange) {
+        return mergeFrom((KeyRange) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.KeyRange other) {
-      if (other == com.google.spanner.v1.KeyRange.getDefaultInstance()) return this;
+    public Builder mergeFrom(KeyRange other) {
+      if (other == KeyRange.getDefaultInstance()) return this;
       switch (other.getStartKeyTypeCase()) {
         case START_CLOSED:
           {
@@ -1004,21 +989,21 @@ public Builder mergeFrom(com.google.spanner.v1.KeyRange other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.KeyRange parsedMessage = null;
+      KeyRange parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.KeyRange) e.getUnfinishedMessage();
+        parsedMessage = (KeyRange) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -1029,7 +1014,7 @@ public Builder mergeFrom(
     }
 
     private int startKeyTypeCase_ = 0;
-    private java.lang.Object startKeyType_;
+    private Object startKeyType_;
 
     public StartKeyTypeCase getStartKeyTypeCase() {
       return StartKeyTypeCase.forNumber(startKeyTypeCase_);
@@ -1043,7 +1028,7 @@ public Builder clearStartKeyType() {
     }
 
     private int endKeyTypeCase_ = 0;
-    private java.lang.Object endKeyType_;
+    private Object endKeyType_;
 
     public EndKeyTypeCase getEndKeyTypeCase() {
       return EndKeyTypeCase.forNumber(endKeyTypeCase_);
@@ -1073,7 +1058,7 @@ public Builder clearEndKeyType() {
      *
      * @return Whether the startClosed field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasStartClosed() {
       return startKeyTypeCase_ == 1;
     }
@@ -1089,7 +1074,7 @@ public boolean hasStartClosed() {
      *
      * @return The startClosed.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ListValue getStartClosed() {
       if (startClosedBuilder_ == null) {
         if (startKeyTypeCase_ == 1) {
@@ -1227,7 +1212,7 @@ public com.google.protobuf.ListValue.Builder getStartClosedBuilder() {
      *
      * .google.protobuf.ListValue start_closed = 1;
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ListValueOrBuilder getStartClosedOrBuilder() {
       if ((startKeyTypeCase_ == 1) && (startClosedBuilder_ != null)) {
         return startClosedBuilder_.getMessageOrBuilder();
@@ -1288,7 +1273,7 @@ public com.google.protobuf.ListValueOrBuilder getStartClosedOrBuilder() {
      *
      * @return Whether the startOpen field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasStartOpen() {
       return startKeyTypeCase_ == 2;
     }
@@ -1304,7 +1289,7 @@ public boolean hasStartOpen() {
      *
      * @return The startOpen.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ListValue getStartOpen() {
       if (startOpenBuilder_ == null) {
         if (startKeyTypeCase_ == 2) {
@@ -1442,7 +1427,7 @@ public com.google.protobuf.ListValue.Builder getStartOpenBuilder() {
      *
      * .google.protobuf.ListValue start_open = 2;
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ListValueOrBuilder getStartOpenOrBuilder() {
       if ((startKeyTypeCase_ == 2) && (startOpenBuilder_ != null)) {
         return startOpenBuilder_.getMessageOrBuilder();
@@ -1503,7 +1488,7 @@ public com.google.protobuf.ListValueOrBuilder getStartOpenOrBuilder() {
      *
      * @return Whether the endClosed field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasEndClosed() {
       return endKeyTypeCase_ == 3;
     }
@@ -1519,7 +1504,7 @@ public boolean hasEndClosed() {
      *
      * @return The endClosed.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ListValue getEndClosed() {
       if (endClosedBuilder_ == null) {
         if (endKeyTypeCase_ == 3) {
@@ -1656,7 +1641,7 @@ public com.google.protobuf.ListValue.Builder getEndClosedBuilder() {
      *
      * .google.protobuf.ListValue end_closed = 3;
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ListValueOrBuilder getEndClosedOrBuilder() {
       if ((endKeyTypeCase_ == 3) && (endClosedBuilder_ != null)) {
         return endClosedBuilder_.getMessageOrBuilder();
@@ -1717,7 +1702,7 @@ public com.google.protobuf.ListValueOrBuilder getEndClosedOrBuilder() {
      *
      * @return Whether the endOpen field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasEndOpen() {
       return endKeyTypeCase_ == 4;
     }
@@ -1733,7 +1718,7 @@ public boolean hasEndOpen() {
      *
      * @return The endOpen.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ListValue getEndOpen() {
       if (endOpenBuilder_ == null) {
         if (endKeyTypeCase_ == 4) {
@@ -1870,7 +1855,7 @@ public com.google.protobuf.ListValue.Builder getEndOpenBuilder() {
      *
      * .google.protobuf.ListValue end_open = 4;
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ListValueOrBuilder getEndOpenOrBuilder() {
       if ((endKeyTypeCase_ == 4) && (endOpenBuilder_ != null)) {
         return endOpenBuilder_.getMessageOrBuilder();
@@ -1914,12 +1899,12 @@ public com.google.protobuf.ListValueOrBuilder getEndOpenOrBuilder() {
       return endOpenBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1929,19 +1914,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.KeyRange)
-  private static final com.google.spanner.v1.KeyRange DEFAULT_INSTANCE;
+  private static final KeyRange DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.KeyRange();
+    DEFAULT_INSTANCE = new KeyRange();
   }
 
-  public static com.google.spanner.v1.KeyRange getDefaultInstance() {
+  public static KeyRange getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public KeyRange parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1954,13 +1939,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.KeyRange getDefaultInstanceForType() {
+  @Override
+  public KeyRange getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRangeOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRangeOrBuilder.java
index c6a5e89496..dca2b33c9a 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRangeOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRangeOrBuilder.java
@@ -175,7 +175,7 @@ public interface KeyRangeOrBuilder
    */
   com.google.protobuf.ListValueOrBuilder getEndOpenOrBuilder();
 
-  public com.google.spanner.v1.KeyRange.StartKeyTypeCase getStartKeyTypeCase();
+  public KeyRange.StartKeyTypeCase getStartKeyTypeCase();
 
-  public com.google.spanner.v1.KeyRange.EndKeyTypeCase getEndKeyTypeCase();
+  public KeyRange.EndKeyTypeCase getEndKeyTypeCase();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java
index c9cc35fa86..f42a7201a0 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java
@@ -47,13 +47,13 @@ private KeySet() {
     ranges_ = java.util.Collections.emptyList();
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new KeySet();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -64,7 +64,7 @@ private KeySet(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -90,11 +90,10 @@ private KeySet(
           case 18:
             {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                ranges_ = new java.util.ArrayList();
+                ranges_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              ranges_.add(
-                  input.readMessage(com.google.spanner.v1.KeyRange.parser(), extensionRegistry));
+              ranges_.add(input.readMessage(KeyRange.parser(), extensionRegistry));
               break;
             }
           case 24:
@@ -128,16 +127,13 @@ private KeySet(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
+    return KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.KeysProto
-        .internal_static_google_spanner_v1_KeySet_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.KeySet.class, com.google.spanner.v1.KeySet.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return KeysProto.internal_static_google_spanner_v1_KeySet_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(KeySet.class, Builder.class);
   }
 
   public static final int KEYS_FIELD_NUMBER = 1;
@@ -154,7 +150,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * repeated .google.protobuf.ListValue keys = 1;
    */
-  @java.lang.Override
+  @Override
   public java.util.List getKeysList() {
     return keys_;
   }
@@ -170,7 +166,7 @@ public java.util.List getKeysList() {
    *
    * repeated .google.protobuf.ListValue keys = 1;
    */
-  @java.lang.Override
+  @Override
   public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
@@ -186,7 +182,7 @@ public java.util.List getKeysO
    *
    * repeated .google.protobuf.ListValue keys = 1;
    */
-  @java.lang.Override
+  @Override
   public int getKeysCount() {
     return keys_.size();
   }
@@ -202,7 +198,7 @@ public int getKeysCount() {
    *
    * repeated .google.protobuf.ListValue keys = 1;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ListValue getKeys(int index) {
     return keys_.get(index);
   }
@@ -218,13 +214,13 @@ public com.google.protobuf.ListValue getKeys(int index) {
    *
    * repeated .google.protobuf.ListValue keys = 1;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ListValueOrBuilder getKeysOrBuilder(int index) {
     return keys_.get(index);
   }
 
   public static final int RANGES_FIELD_NUMBER = 2;
-  private java.util.List ranges_;
+  private java.util.List ranges_;
   /**
    *
    *
@@ -235,8 +231,8 @@ public com.google.protobuf.ListValueOrBuilder getKeysOrBuilder(int index) {
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  @java.lang.Override
-  public java.util.List getRangesList() {
+  @Override
+  public java.util.List getRangesList() {
     return ranges_;
   }
   /**
@@ -249,9 +245,8 @@ public java.util.List getRangesList() {
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  @java.lang.Override
-  public java.util.List
-      getRangesOrBuilderList() {
+  @Override
+  public java.util.List getRangesOrBuilderList() {
     return ranges_;
   }
   /**
@@ -264,7 +259,7 @@ public java.util.List getRangesList() {
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  @java.lang.Override
+  @Override
   public int getRangesCount() {
     return ranges_.size();
   }
@@ -278,8 +273,8 @@ public int getRangesCount() {
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.KeyRange getRanges(int index) {
+  @Override
+  public KeyRange getRanges(int index) {
     return ranges_.get(index);
   }
   /**
@@ -292,8 +287,8 @@ public com.google.spanner.v1.KeyRange getRanges(int index) {
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.KeyRangeOrBuilder getRangesOrBuilder(int index) {
+  @Override
+  public KeyRangeOrBuilder getRangesOrBuilder(int index) {
     return ranges_.get(index);
   }
 
@@ -312,14 +307,14 @@ public com.google.spanner.v1.KeyRangeOrBuilder getRangesOrBuilder(int index) {
    *
    * @return The all.
    */
-  @java.lang.Override
+  @Override
   public boolean getAll() {
     return all_;
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -329,7 +324,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < keys_.size(); i++) {
       output.writeMessage(1, keys_.get(i));
@@ -343,7 +338,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -363,15 +358,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.KeySet)) {
+    if (!(obj instanceof KeySet)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.KeySet other = (com.google.spanner.v1.KeySet) obj;
+    KeySet other = (KeySet) obj;
 
     if (!getKeysList().equals(other.getKeysList())) return false;
     if (!getRangesList().equals(other.getRangesList())) return false;
@@ -380,7 +375,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -402,70 +397,68 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.KeySet parseFrom(java.nio.ByteBuffer data)
+  public static KeySet parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.KeySet parseFrom(
+  public static KeySet parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.KeySet parseFrom(com.google.protobuf.ByteString data)
+  public static KeySet parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.KeySet parseFrom(
+  public static KeySet 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.spanner.v1.KeySet parseFrom(byte[] data)
+  public static KeySet parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.KeySet parseFrom(
+  public static KeySet parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.KeySet parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static KeySet parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.KeySet parseFrom(
+  public static KeySet 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.spanner.v1.KeySet parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static KeySet parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.KeySet parseDelimitedFrom(
+  public static KeySet 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.spanner.v1.KeySet parseFrom(com.google.protobuf.CodedInputStream input)
+  public static KeySet parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.KeySet parseFrom(
+  public static KeySet parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -473,7 +466,7 @@ public static com.google.spanner.v1.KeySet parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -482,17 +475,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.KeySet prototype) {
+  public static Builder newBuilder(KeySet prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -513,18 +506,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.KeySet)
-      com.google.spanner.v1.KeySetOrBuilder {
+      KeySetOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
+      return KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.KeysProto
-          .internal_static_google_spanner_v1_KeySet_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.KeySet.class, com.google.spanner.v1.KeySet.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return KeysProto.internal_static_google_spanner_v1_KeySet_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(KeySet.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.KeySet.newBuilder()
@@ -532,7 +522,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -544,7 +534,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       if (keysBuilder_ == null) {
@@ -564,28 +554,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
+      return KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.KeySet getDefaultInstanceForType() {
-      return com.google.spanner.v1.KeySet.getDefaultInstance();
+    @Override
+    public KeySet getDefaultInstanceForType() {
+      return KeySet.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.KeySet build() {
-      com.google.spanner.v1.KeySet result = buildPartial();
+    @Override
+    public KeySet build() {
+      KeySet result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.KeySet buildPartial() {
-      com.google.spanner.v1.KeySet result = new com.google.spanner.v1.KeySet(this);
+    @Override
+    public KeySet buildPartial() {
+      KeySet result = new KeySet(this);
       int from_bitField0_ = bitField0_;
       if (keysBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -610,51 +600,50 @@ public com.google.spanner.v1.KeySet buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.KeySet) {
-        return mergeFrom((com.google.spanner.v1.KeySet) other);
+      if (other instanceof KeySet) {
+        return mergeFrom((KeySet) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.KeySet other) {
-      if (other == com.google.spanner.v1.KeySet.getDefaultInstance()) return this;
+    public Builder mergeFrom(KeySet other) {
+      if (other == KeySet.getDefaultInstance()) return this;
       if (keysBuilder_ == null) {
         if (!other.keys_.isEmpty()) {
           if (keys_.isEmpty()) {
@@ -717,21 +706,21 @@ public Builder mergeFrom(com.google.spanner.v1.KeySet other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.KeySet parsedMessage = null;
+      KeySet parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.KeySet) e.getUnfinishedMessage();
+        parsedMessage = (KeySet) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -968,7 +957,7 @@ public Builder addKeys(int index, com.google.protobuf.ListValue.Builder builderF
      *
      * repeated .google.protobuf.ListValue keys = 1;
      */
-    public Builder addAllKeys(java.lang.Iterable values) {
+    public Builder addAllKeys(Iterable values) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, keys_);
@@ -1139,20 +1128,17 @@ public java.util.List getKeysBuilderList(
       return keysBuilder_;
     }
 
-    private java.util.List ranges_ =
-        java.util.Collections.emptyList();
+    private java.util.List ranges_ = java.util.Collections.emptyList();
 
     private void ensureRangesIsMutable() {
       if (!((bitField0_ & 0x00000002) != 0)) {
-        ranges_ = new java.util.ArrayList(ranges_);
+        ranges_ = new java.util.ArrayList(ranges_);
         bitField0_ |= 0x00000002;
       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.KeyRange,
-            com.google.spanner.v1.KeyRange.Builder,
-            com.google.spanner.v1.KeyRangeOrBuilder>
+            KeyRange, KeyRange.Builder, KeyRangeOrBuilder>
         rangesBuilder_;
 
     /**
@@ -1165,7 +1151,7 @@ private void ensureRangesIsMutable() {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public java.util.List getRangesList() {
+    public java.util.List getRangesList() {
       if (rangesBuilder_ == null) {
         return java.util.Collections.unmodifiableList(ranges_);
       } else {
@@ -1199,7 +1185,7 @@ public int getRangesCount() {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public com.google.spanner.v1.KeyRange getRanges(int index) {
+    public KeyRange getRanges(int index) {
       if (rangesBuilder_ == null) {
         return ranges_.get(index);
       } else {
@@ -1216,7 +1202,7 @@ public com.google.spanner.v1.KeyRange getRanges(int index) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder setRanges(int index, com.google.spanner.v1.KeyRange value) {
+    public Builder setRanges(int index, KeyRange value) {
       if (rangesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1239,7 +1225,7 @@ public Builder setRanges(int index, com.google.spanner.v1.KeyRange value) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder setRanges(int index, com.google.spanner.v1.KeyRange.Builder builderForValue) {
+    public Builder setRanges(int index, KeyRange.Builder builderForValue) {
       if (rangesBuilder_ == null) {
         ensureRangesIsMutable();
         ranges_.set(index, builderForValue.build());
@@ -1259,7 +1245,7 @@ public Builder setRanges(int index, com.google.spanner.v1.KeyRange.Builder build
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder addRanges(com.google.spanner.v1.KeyRange value) {
+    public Builder addRanges(KeyRange value) {
       if (rangesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1282,7 +1268,7 @@ public Builder addRanges(com.google.spanner.v1.KeyRange value) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder addRanges(int index, com.google.spanner.v1.KeyRange value) {
+    public Builder addRanges(int index, KeyRange value) {
       if (rangesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1305,7 +1291,7 @@ public Builder addRanges(int index, com.google.spanner.v1.KeyRange value) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder addRanges(com.google.spanner.v1.KeyRange.Builder builderForValue) {
+    public Builder addRanges(KeyRange.Builder builderForValue) {
       if (rangesBuilder_ == null) {
         ensureRangesIsMutable();
         ranges_.add(builderForValue.build());
@@ -1325,7 +1311,7 @@ public Builder addRanges(com.google.spanner.v1.KeyRange.Builder builderForValue)
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder addRanges(int index, com.google.spanner.v1.KeyRange.Builder builderForValue) {
+    public Builder addRanges(int index, KeyRange.Builder builderForValue) {
       if (rangesBuilder_ == null) {
         ensureRangesIsMutable();
         ranges_.add(index, builderForValue.build());
@@ -1345,8 +1331,7 @@ public Builder addRanges(int index, com.google.spanner.v1.KeyRange.Builder build
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder addAllRanges(
-        java.lang.Iterable values) {
+    public Builder addAllRanges(Iterable values) {
       if (rangesBuilder_ == null) {
         ensureRangesIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, ranges_);
@@ -1406,7 +1391,7 @@ public Builder removeRanges(int index) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public com.google.spanner.v1.KeyRange.Builder getRangesBuilder(int index) {
+    public KeyRange.Builder getRangesBuilder(int index) {
       return getRangesFieldBuilder().getBuilder(index);
     }
     /**
@@ -1419,7 +1404,7 @@ public com.google.spanner.v1.KeyRange.Builder getRangesBuilder(int index) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public com.google.spanner.v1.KeyRangeOrBuilder getRangesOrBuilder(int index) {
+    public KeyRangeOrBuilder getRangesOrBuilder(int index) {
       if (rangesBuilder_ == null) {
         return ranges_.get(index);
       } else {
@@ -1436,8 +1421,7 @@ public com.google.spanner.v1.KeyRangeOrBuilder getRangesOrBuilder(int index) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public java.util.List
-        getRangesOrBuilderList() {
+    public java.util.List getRangesOrBuilderList() {
       if (rangesBuilder_ != null) {
         return rangesBuilder_.getMessageOrBuilderList();
       } else {
@@ -1454,9 +1438,8 @@ public com.google.spanner.v1.KeyRangeOrBuilder getRangesOrBuilder(int index) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public com.google.spanner.v1.KeyRange.Builder addRangesBuilder() {
-      return getRangesFieldBuilder()
-          .addBuilder(com.google.spanner.v1.KeyRange.getDefaultInstance());
+    public KeyRange.Builder addRangesBuilder() {
+      return getRangesFieldBuilder().addBuilder(KeyRange.getDefaultInstance());
     }
     /**
      *
@@ -1468,9 +1451,8 @@ public com.google.spanner.v1.KeyRange.Builder addRangesBuilder() {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public com.google.spanner.v1.KeyRange.Builder addRangesBuilder(int index) {
-      return getRangesFieldBuilder()
-          .addBuilder(index, com.google.spanner.v1.KeyRange.getDefaultInstance());
+    public KeyRange.Builder addRangesBuilder(int index) {
+      return getRangesFieldBuilder().addBuilder(index, KeyRange.getDefaultInstance());
     }
     /**
      *
@@ -1482,21 +1464,17 @@ public com.google.spanner.v1.KeyRange.Builder addRangesBuilder(int index) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public java.util.List getRangesBuilderList() {
+    public java.util.List getRangesBuilderList() {
       return getRangesFieldBuilder().getBuilderList();
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.KeyRange,
-            com.google.spanner.v1.KeyRange.Builder,
-            com.google.spanner.v1.KeyRangeOrBuilder>
+            KeyRange, KeyRange.Builder, KeyRangeOrBuilder>
         getRangesFieldBuilder() {
       if (rangesBuilder_ == null) {
         rangesBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.spanner.v1.KeyRange,
-                com.google.spanner.v1.KeyRange.Builder,
-                com.google.spanner.v1.KeyRangeOrBuilder>(
+                KeyRange, KeyRange.Builder, KeyRangeOrBuilder>(
                 ranges_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         ranges_ = null;
       }
@@ -1517,7 +1495,7 @@ public java.util.List getRangesBuilderLi
      *
      * @return The all.
      */
-    @java.lang.Override
+    @Override
     public boolean getAll() {
       return all_;
     }
@@ -1561,12 +1539,12 @@ public Builder clearAll() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1576,19 +1554,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.KeySet)
-  private static final com.google.spanner.v1.KeySet DEFAULT_INSTANCE;
+  private static final KeySet DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.KeySet();
+    DEFAULT_INSTANCE = new KeySet();
   }
 
-  public static com.google.spanner.v1.KeySet getDefaultInstance() {
+  public static KeySet getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public KeySet parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1601,13 +1579,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.KeySet getDefaultInstanceForType() {
+  @Override
+  public KeySet getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySetOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySetOrBuilder.java
index 7ff32d6843..c7bf48e932 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySetOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySetOrBuilder.java
@@ -99,7 +99,7 @@ public interface KeySetOrBuilder
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  java.util.List getRangesList();
+  java.util.List getRangesList();
   /**
    *
    *
@@ -110,7 +110,7 @@ public interface KeySetOrBuilder
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  com.google.spanner.v1.KeyRange getRanges(int index);
+  KeyRange getRanges(int index);
   /**
    *
    *
@@ -132,7 +132,7 @@ public interface KeySetOrBuilder
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  java.util.List getRangesOrBuilderList();
+  java.util.List getRangesOrBuilderList();
   /**
    *
    *
@@ -143,7 +143,7 @@ public interface KeySetOrBuilder
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  com.google.spanner.v1.KeyRangeOrBuilder getRangesOrBuilder(int index);
+  KeyRangeOrBuilder getRangesOrBuilder(int index);
 
   /**
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java
index 9c9b6318d1..298a03a0db 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java
@@ -43,7 +43,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
   static {
-    java.lang.String[] descriptorData = {
+    String[] descriptorData = {
       "\n\034google/spanner/v1/keys.proto\022\021google.s"
           + "panner.v1\032\034google/protobuf/struct.proto\032"
           + "\034google/api/annotations.proto\"\364\001\n\010KeyRan"
@@ -74,14 +74,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_KeyRange_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_KeyRange_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "StartClosed", "StartOpen", "EndClosed", "EndOpen", "StartKeyType", "EndKeyType",
             });
     internal_static_google_spanner_v1_KeySet_descriptor = getDescriptor().getMessageTypes().get(1);
     internal_static_google_spanner_v1_KeySet_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_KeySet_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Keys", "Ranges", "All",
             });
     com.google.protobuf.StructProto.getDescriptor();
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java
index 6d39079533..4a5ec2be39 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java
@@ -43,13 +43,13 @@ private ListSessionsRequest() {
     filter_ = "";
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new ListSessionsRequest();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -60,7 +60,7 @@ private ListSessionsRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -74,7 +74,7 @@ private ListSessionsRequest(
             break;
           case 10:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               database_ = s;
               break;
@@ -86,14 +86,14 @@ private ListSessionsRequest(
             }
           case 26:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               pageToken_ = s;
               break;
             }
           case 34:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               filter_ = s;
               break;
@@ -118,22 +118,17 @@ private ListSessionsRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
+    return SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_ListSessionsRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.ListSessionsRequest.class,
-            com.google.spanner.v1.ListSessionsRequest.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(ListSessionsRequest.class, Builder.class);
   }
 
   public static final int DATABASE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object database_;
+  private volatile Object database_;
   /**
    *
    *
@@ -147,14 +142,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The database.
    */
-  @java.lang.Override
-  public java.lang.String getDatabase() {
-    java.lang.Object ref = database_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getDatabase() {
+    Object ref = database_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       database_ = s;
       return s;
     }
@@ -172,12 +167,11 @@ public java.lang.String getDatabase() {
    *
    * @return The bytes for database.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ByteString getDatabaseBytes() {
-    java.lang.Object ref = database_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+    Object ref = database_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       database_ = b;
       return b;
     } else {
@@ -199,13 +193,13 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
    *
    * @return The pageSize.
    */
-  @java.lang.Override
+  @Override
   public int getPageSize() {
     return pageSize_;
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
+  private volatile Object pageToken_;
   /**
    *
    *
@@ -219,14 +213,14 @@ public int getPageSize() {
    *
    * @return The pageToken.
    */
-  @java.lang.Override
-  public java.lang.String getPageToken() {
-    java.lang.Object ref = pageToken_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getPageToken() {
+    Object ref = pageToken_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       pageToken_ = s;
       return s;
     }
@@ -244,12 +238,11 @@ public java.lang.String getPageToken() {
    *
    * @return The bytes for pageToken.
    */
-  @java.lang.Override
+  @Override
   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);
+    Object ref = pageToken_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       pageToken_ = b;
       return b;
     } else {
@@ -258,7 +251,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
-  private volatile java.lang.Object filter_;
+  private volatile Object filter_;
   /**
    *
    *
@@ -276,14 +269,14 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
    *
    * @return The filter.
    */
-  @java.lang.Override
-  public java.lang.String getFilter() {
-    java.lang.Object ref = filter_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getFilter() {
+    Object ref = filter_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       filter_ = s;
       return s;
     }
@@ -305,12 +298,11 @@ public java.lang.String getFilter() {
    *
    * @return The bytes for filter.
    */
-  @java.lang.Override
+  @Override
   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);
+    Object ref = filter_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       filter_ = b;
       return b;
     } else {
@@ -320,7 +312,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -330,7 +322,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, database_);
@@ -347,7 +339,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -370,16 +362,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.ListSessionsRequest)) {
+    if (!(obj instanceof ListSessionsRequest)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.ListSessionsRequest other =
-        (com.google.spanner.v1.ListSessionsRequest) obj;
+    ListSessionsRequest other = (ListSessionsRequest) obj;
 
     if (!getDatabase().equals(other.getDatabase())) return false;
     if (getPageSize() != other.getPageSize()) return false;
@@ -389,7 +380,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -409,71 +400,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.ListSessionsRequest parseFrom(java.nio.ByteBuffer data)
+  public static ListSessionsRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ListSessionsRequest parseFrom(
+  public static ListSessionsRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.ListSessionsRequest parseFrom(
-      com.google.protobuf.ByteString data)
+  public static ListSessionsRequest parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ListSessionsRequest parseFrom(
+  public static ListSessionsRequest 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.spanner.v1.ListSessionsRequest parseFrom(byte[] data)
+  public static ListSessionsRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ListSessionsRequest parseFrom(
+  public static ListSessionsRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.ListSessionsRequest parseFrom(java.io.InputStream input)
+  public static ListSessionsRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ListSessionsRequest parseFrom(
+  public static ListSessionsRequest 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.spanner.v1.ListSessionsRequest parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
+  public static ListSessionsRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ListSessionsRequest parseDelimitedFrom(
+  public static ListSessionsRequest 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.spanner.v1.ListSessionsRequest parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static ListSessionsRequest parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ListSessionsRequest parseFrom(
+  public static ListSessionsRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -481,7 +471,7 @@ public static com.google.spanner.v1.ListSessionsRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -490,17 +480,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.ListSessionsRequest prototype) {
+  public static Builder newBuilder(ListSessionsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -516,20 +506,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.ListSessionsRequest)
-      com.google.spanner.v1.ListSessionsRequestOrBuilder {
+      ListSessionsRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_ListSessionsRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.ListSessionsRequest.class,
-              com.google.spanner.v1.ListSessionsRequest.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(ListSessionsRequest.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.ListSessionsRequest.newBuilder()
@@ -537,7 +522,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -546,7 +531,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -560,30 +545,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ListSessionsRequest getDefaultInstanceForType() {
-      return com.google.spanner.v1.ListSessionsRequest.getDefaultInstance();
+    @Override
+    public ListSessionsRequest getDefaultInstanceForType() {
+      return ListSessionsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ListSessionsRequest build() {
-      com.google.spanner.v1.ListSessionsRequest result = buildPartial();
+    @Override
+    public ListSessionsRequest build() {
+      ListSessionsRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ListSessionsRequest buildPartial() {
-      com.google.spanner.v1.ListSessionsRequest result =
-          new com.google.spanner.v1.ListSessionsRequest(this);
+    @Override
+    public ListSessionsRequest buildPartial() {
+      ListSessionsRequest result = new ListSessionsRequest(this);
       result.database_ = database_;
       result.pageSize_ = pageSize_;
       result.pageToken_ = pageToken_;
@@ -592,51 +575,50 @@ public com.google.spanner.v1.ListSessionsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.ListSessionsRequest) {
-        return mergeFrom((com.google.spanner.v1.ListSessionsRequest) other);
+      if (other instanceof ListSessionsRequest) {
+        return mergeFrom((ListSessionsRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.ListSessionsRequest other) {
-      if (other == com.google.spanner.v1.ListSessionsRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(ListSessionsRequest other) {
+      if (other == ListSessionsRequest.getDefaultInstance()) return this;
       if (!other.getDatabase().isEmpty()) {
         database_ = other.database_;
         onChanged();
@@ -657,21 +639,21 @@ public Builder mergeFrom(com.google.spanner.v1.ListSessionsRequest other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.ListSessionsRequest parsedMessage = null;
+      ListSessionsRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.ListSessionsRequest) e.getUnfinishedMessage();
+        parsedMessage = (ListSessionsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -681,7 +663,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private java.lang.Object database_ = "";
+    private Object database_ = "";
     /**
      *
      *
@@ -695,15 +677,15 @@ public Builder mergeFrom(
      *
      * @return The database.
      */
-    public java.lang.String getDatabase() {
-      java.lang.Object ref = database_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getDatabase() {
+      Object ref = database_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         database_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -720,10 +702,10 @@ public java.lang.String getDatabase() {
      * @return The bytes for database.
      */
     public com.google.protobuf.ByteString getDatabaseBytes() {
-      java.lang.Object ref = database_;
+      Object ref = database_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         database_ = b;
         return b;
       } else {
@@ -744,7 +726,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
      * @param value The database to set.
      * @return This builder for chaining.
      */
-    public Builder setDatabase(java.lang.String value) {
+    public Builder setDatabase(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -810,7 +792,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) {
      *
      * @return The pageSize.
      */
-    @java.lang.Override
+    @Override
     public int getPageSize() {
       return pageSize_;
     }
@@ -852,7 +834,7 @@ public Builder clearPageSize() {
       return this;
     }
 
-    private java.lang.Object pageToken_ = "";
+    private Object pageToken_ = "";
     /**
      *
      *
@@ -866,15 +848,15 @@ public Builder clearPageSize() {
      *
      * @return The pageToken.
      */
-    public java.lang.String getPageToken() {
-      java.lang.Object ref = pageToken_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getPageToken() {
+      Object ref = pageToken_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         pageToken_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -891,10 +873,10 @@ public java.lang.String getPageToken() {
      * @return The bytes for pageToken.
      */
     public com.google.protobuf.ByteString getPageTokenBytes() {
-      java.lang.Object ref = pageToken_;
+      Object ref = pageToken_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         pageToken_ = b;
         return b;
       } else {
@@ -915,7 +897,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      * @param value The pageToken to set.
      * @return This builder for chaining.
      */
-    public Builder setPageToken(java.lang.String value) {
+    public Builder setPageToken(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -968,7 +950,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private java.lang.Object filter_ = "";
+    private Object filter_ = "";
     /**
      *
      *
@@ -986,15 +968,15 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
      *
      * @return The filter.
      */
-    public java.lang.String getFilter() {
-      java.lang.Object ref = filter_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getFilter() {
+      Object ref = filter_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         filter_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -1015,10 +997,10 @@ public java.lang.String getFilter() {
      * @return The bytes for filter.
      */
     public com.google.protobuf.ByteString getFilterBytes() {
-      java.lang.Object ref = filter_;
+      Object ref = filter_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         filter_ = b;
         return b;
       } else {
@@ -1043,7 +1025,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
      * @param value The filter to set.
      * @return This builder for chaining.
      */
-    public Builder setFilter(java.lang.String value) {
+    public Builder setFilter(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1104,12 +1086,12 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1119,19 +1101,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.ListSessionsRequest)
-  private static final com.google.spanner.v1.ListSessionsRequest DEFAULT_INSTANCE;
+  private static final ListSessionsRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.ListSessionsRequest();
+    DEFAULT_INSTANCE = new ListSessionsRequest();
   }
 
-  public static com.google.spanner.v1.ListSessionsRequest getDefaultInstance() {
+  public static ListSessionsRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public ListSessionsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1144,13 +1126,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.ListSessionsRequest getDefaultInstanceForType() {
+  @Override
+  public ListSessionsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequestOrBuilder.java
index 98c63809bb..26854aa672 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface ListSessionsRequestOrBuilder
    *
    * @return The database.
    */
-  java.lang.String getDatabase();
+  String getDatabase();
   /**
    *
    *
@@ -79,7 +79,7 @@ public interface ListSessionsRequestOrBuilder
    *
    * @return The pageToken.
    */
-  java.lang.String getPageToken();
+  String getPageToken();
   /**
    *
    *
@@ -112,7 +112,7 @@ public interface ListSessionsRequestOrBuilder
    *
    * @return The filter.
    */
-  java.lang.String getFilter();
+  String getFilter();
   /**
    *
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java
index 6e7f0627e5..d8f7dd248a 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java
@@ -42,13 +42,13 @@ private ListSessionsResponse() {
     nextPageToken_ = "";
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new ListSessionsResponse();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private ListSessionsResponse(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -75,16 +75,15 @@ private ListSessionsResponse(
           case 10:
             {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                sessions_ = new java.util.ArrayList();
+                sessions_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              sessions_.add(
-                  input.readMessage(com.google.spanner.v1.Session.parser(), extensionRegistry));
+              sessions_.add(input.readMessage(Session.parser(), extensionRegistry));
               break;
             }
           case 18:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               nextPageToken_ = s;
               break;
@@ -112,22 +111,17 @@ private ListSessionsResponse(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
+    return SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_ListSessionsResponse_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.ListSessionsResponse.class,
-            com.google.spanner.v1.ListSessionsResponse.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(ListSessionsResponse.class, Builder.class);
   }
 
   public static final int SESSIONS_FIELD_NUMBER = 1;
-  private java.util.List sessions_;
+  private java.util.List sessions_;
   /**
    *
    *
@@ -137,8 +131,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  @java.lang.Override
-  public java.util.List getSessionsList() {
+  @Override
+  public java.util.List getSessionsList() {
     return sessions_;
   }
   /**
@@ -150,9 +144,8 @@ public java.util.List getSessionsList() {
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  @java.lang.Override
-  public java.util.List
-      getSessionsOrBuilderList() {
+  @Override
+  public java.util.List getSessionsOrBuilderList() {
     return sessions_;
   }
   /**
@@ -164,7 +157,7 @@ public java.util.List getSessionsList() {
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  @java.lang.Override
+  @Override
   public int getSessionsCount() {
     return sessions_.size();
   }
@@ -177,8 +170,8 @@ public int getSessionsCount() {
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Session getSessions(int index) {
+  @Override
+  public Session getSessions(int index) {
     return sessions_.get(index);
   }
   /**
@@ -190,13 +183,13 @@ public com.google.spanner.v1.Session getSessions(int index) {
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.SessionOrBuilder getSessionsOrBuilder(int index) {
+  @Override
+  public SessionOrBuilder getSessionsOrBuilder(int index) {
     return sessions_.get(index);
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
+  private volatile Object nextPageToken_;
   /**
    *
    *
@@ -210,14 +203,14 @@ public com.google.spanner.v1.SessionOrBuilder getSessionsOrBuilder(int index) {
    *
    * @return The nextPageToken.
    */
-  @java.lang.Override
-  public java.lang.String getNextPageToken() {
-    java.lang.Object ref = nextPageToken_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getNextPageToken() {
+    Object ref = nextPageToken_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       nextPageToken_ = s;
       return s;
     }
@@ -235,12 +228,11 @@ public java.lang.String getNextPageToken() {
    *
    * @return The bytes for nextPageToken.
    */
-  @java.lang.Override
+  @Override
   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);
+    Object ref = nextPageToken_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       nextPageToken_ = b;
       return b;
     } else {
@@ -250,7 +242,7 @@ public com.google.protobuf.ByteString getNextPageTokenBytes() {
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -260,7 +252,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < sessions_.size(); i++) {
       output.writeMessage(1, sessions_.get(i));
@@ -271,7 +263,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -288,16 +280,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.ListSessionsResponse)) {
+    if (!(obj instanceof ListSessionsResponse)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.ListSessionsResponse other =
-        (com.google.spanner.v1.ListSessionsResponse) obj;
+    ListSessionsResponse other = (ListSessionsResponse) obj;
 
     if (!getSessionsList().equals(other.getSessionsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
@@ -305,7 +296,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -323,71 +314,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.ListSessionsResponse parseFrom(java.nio.ByteBuffer data)
+  public static ListSessionsResponse parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ListSessionsResponse parseFrom(
+  public static ListSessionsResponse parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.ListSessionsResponse parseFrom(
-      com.google.protobuf.ByteString data)
+  public static ListSessionsResponse parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ListSessionsResponse parseFrom(
+  public static ListSessionsResponse 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.spanner.v1.ListSessionsResponse parseFrom(byte[] data)
+  public static ListSessionsResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ListSessionsResponse parseFrom(
+  public static ListSessionsResponse parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.ListSessionsResponse parseFrom(java.io.InputStream input)
+  public static ListSessionsResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ListSessionsResponse parseFrom(
+  public static ListSessionsResponse 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.spanner.v1.ListSessionsResponse parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
+  public static ListSessionsResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ListSessionsResponse parseDelimitedFrom(
+  public static ListSessionsResponse 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.spanner.v1.ListSessionsResponse parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static ListSessionsResponse parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ListSessionsResponse parseFrom(
+  public static ListSessionsResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -395,7 +385,7 @@ public static com.google.spanner.v1.ListSessionsResponse parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -404,17 +394,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.ListSessionsResponse prototype) {
+  public static Builder newBuilder(ListSessionsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -430,20 +420,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.ListSessionsResponse)
-      com.google.spanner.v1.ListSessionsResponseOrBuilder {
+      ListSessionsResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_ListSessionsResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.ListSessionsResponse.class,
-              com.google.spanner.v1.ListSessionsResponse.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(ListSessionsResponse.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.ListSessionsResponse.newBuilder()
@@ -451,7 +436,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -462,7 +447,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       if (sessionsBuilder_ == null) {
@@ -476,30 +461,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ListSessionsResponse getDefaultInstanceForType() {
-      return com.google.spanner.v1.ListSessionsResponse.getDefaultInstance();
+    @Override
+    public ListSessionsResponse getDefaultInstanceForType() {
+      return ListSessionsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ListSessionsResponse build() {
-      com.google.spanner.v1.ListSessionsResponse result = buildPartial();
+    @Override
+    public ListSessionsResponse build() {
+      ListSessionsResponse result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ListSessionsResponse buildPartial() {
-      com.google.spanner.v1.ListSessionsResponse result =
-          new com.google.spanner.v1.ListSessionsResponse(this);
+    @Override
+    public ListSessionsResponse buildPartial() {
+      ListSessionsResponse result = new ListSessionsResponse(this);
       int from_bitField0_ = bitField0_;
       if (sessionsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -515,51 +498,50 @@ public com.google.spanner.v1.ListSessionsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.ListSessionsResponse) {
-        return mergeFrom((com.google.spanner.v1.ListSessionsResponse) other);
+      if (other instanceof ListSessionsResponse) {
+        return mergeFrom((ListSessionsResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.ListSessionsResponse other) {
-      if (other == com.google.spanner.v1.ListSessionsResponse.getDefaultInstance()) return this;
+    public Builder mergeFrom(ListSessionsResponse other) {
+      if (other == ListSessionsResponse.getDefaultInstance()) return this;
       if (sessionsBuilder_ == null) {
         if (!other.sessions_.isEmpty()) {
           if (sessions_.isEmpty()) {
@@ -596,21 +578,21 @@ public Builder mergeFrom(com.google.spanner.v1.ListSessionsResponse other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.ListSessionsResponse parsedMessage = null;
+      ListSessionsResponse parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.ListSessionsResponse) e.getUnfinishedMessage();
+        parsedMessage = (ListSessionsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -622,20 +604,16 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.util.List sessions_ =
-        java.util.Collections.emptyList();
+    private java.util.List sessions_ = java.util.Collections.emptyList();
 
     private void ensureSessionsIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        sessions_ = new java.util.ArrayList(sessions_);
+        sessions_ = new java.util.ArrayList(sessions_);
         bitField0_ |= 0x00000001;
       }
     }
 
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.Session,
-            com.google.spanner.v1.Session.Builder,
-            com.google.spanner.v1.SessionOrBuilder>
+    private com.google.protobuf.RepeatedFieldBuilderV3
         sessionsBuilder_;
 
     /**
@@ -647,7 +625,7 @@ private void ensureSessionsIsMutable() {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public java.util.List getSessionsList() {
+    public java.util.List getSessionsList() {
       if (sessionsBuilder_ == null) {
         return java.util.Collections.unmodifiableList(sessions_);
       } else {
@@ -679,7 +657,7 @@ public int getSessionsCount() {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public com.google.spanner.v1.Session getSessions(int index) {
+    public Session getSessions(int index) {
       if (sessionsBuilder_ == null) {
         return sessions_.get(index);
       } else {
@@ -695,7 +673,7 @@ public com.google.spanner.v1.Session getSessions(int index) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder setSessions(int index, com.google.spanner.v1.Session value) {
+    public Builder setSessions(int index, Session value) {
       if (sessionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -717,7 +695,7 @@ public Builder setSessions(int index, com.google.spanner.v1.Session value) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder setSessions(int index, com.google.spanner.v1.Session.Builder builderForValue) {
+    public Builder setSessions(int index, Session.Builder builderForValue) {
       if (sessionsBuilder_ == null) {
         ensureSessionsIsMutable();
         sessions_.set(index, builderForValue.build());
@@ -736,7 +714,7 @@ public Builder setSessions(int index, com.google.spanner.v1.Session.Builder buil
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder addSessions(com.google.spanner.v1.Session value) {
+    public Builder addSessions(Session value) {
       if (sessionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -758,7 +736,7 @@ public Builder addSessions(com.google.spanner.v1.Session value) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder addSessions(int index, com.google.spanner.v1.Session value) {
+    public Builder addSessions(int index, Session value) {
       if (sessionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -780,7 +758,7 @@ public Builder addSessions(int index, com.google.spanner.v1.Session value) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder addSessions(com.google.spanner.v1.Session.Builder builderForValue) {
+    public Builder addSessions(Session.Builder builderForValue) {
       if (sessionsBuilder_ == null) {
         ensureSessionsIsMutable();
         sessions_.add(builderForValue.build());
@@ -799,7 +777,7 @@ public Builder addSessions(com.google.spanner.v1.Session.Builder builderForValue
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder addSessions(int index, com.google.spanner.v1.Session.Builder builderForValue) {
+    public Builder addSessions(int index, Session.Builder builderForValue) {
       if (sessionsBuilder_ == null) {
         ensureSessionsIsMutable();
         sessions_.add(index, builderForValue.build());
@@ -818,8 +796,7 @@ public Builder addSessions(int index, com.google.spanner.v1.Session.Builder buil
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder addAllSessions(
-        java.lang.Iterable values) {
+    public Builder addAllSessions(Iterable values) {
       if (sessionsBuilder_ == null) {
         ensureSessionsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, sessions_);
@@ -876,7 +853,7 @@ public Builder removeSessions(int index) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public com.google.spanner.v1.Session.Builder getSessionsBuilder(int index) {
+    public Session.Builder getSessionsBuilder(int index) {
       return getSessionsFieldBuilder().getBuilder(index);
     }
     /**
@@ -888,7 +865,7 @@ public com.google.spanner.v1.Session.Builder getSessionsBuilder(int index) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public com.google.spanner.v1.SessionOrBuilder getSessionsOrBuilder(int index) {
+    public SessionOrBuilder getSessionsOrBuilder(int index) {
       if (sessionsBuilder_ == null) {
         return sessions_.get(index);
       } else {
@@ -904,8 +881,7 @@ public com.google.spanner.v1.SessionOrBuilder getSessionsOrBuilder(int index) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public java.util.List
-        getSessionsOrBuilderList() {
+    public java.util.List getSessionsOrBuilderList() {
       if (sessionsBuilder_ != null) {
         return sessionsBuilder_.getMessageOrBuilderList();
       } else {
@@ -921,9 +897,8 @@ public com.google.spanner.v1.SessionOrBuilder getSessionsOrBuilder(int index) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public com.google.spanner.v1.Session.Builder addSessionsBuilder() {
-      return getSessionsFieldBuilder()
-          .addBuilder(com.google.spanner.v1.Session.getDefaultInstance());
+    public Session.Builder addSessionsBuilder() {
+      return getSessionsFieldBuilder().addBuilder(Session.getDefaultInstance());
     }
     /**
      *
@@ -934,9 +909,8 @@ public com.google.spanner.v1.Session.Builder addSessionsBuilder() {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public com.google.spanner.v1.Session.Builder addSessionsBuilder(int index) {
-      return getSessionsFieldBuilder()
-          .addBuilder(index, com.google.spanner.v1.Session.getDefaultInstance());
+    public Session.Builder addSessionsBuilder(int index) {
+      return getSessionsFieldBuilder().addBuilder(index, Session.getDefaultInstance());
     }
     /**
      *
@@ -947,28 +921,23 @@ public com.google.spanner.v1.Session.Builder addSessionsBuilder(int index) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public java.util.List getSessionsBuilderList() {
+    public java.util.List getSessionsBuilderList() {
       return getSessionsFieldBuilder().getBuilderList();
     }
 
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.Session,
-            com.google.spanner.v1.Session.Builder,
-            com.google.spanner.v1.SessionOrBuilder>
+    private com.google.protobuf.RepeatedFieldBuilderV3
         getSessionsFieldBuilder() {
       if (sessionsBuilder_ == null) {
         sessionsBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.spanner.v1.Session,
-                com.google.spanner.v1.Session.Builder,
-                com.google.spanner.v1.SessionOrBuilder>(
+                Session, Session.Builder, SessionOrBuilder>(
                 sessions_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         sessions_ = null;
       }
       return sessionsBuilder_;
     }
 
-    private java.lang.Object nextPageToken_ = "";
+    private Object nextPageToken_ = "";
     /**
      *
      *
@@ -982,15 +951,15 @@ public java.util.List getSessionsBuilderL
      *
      * @return The nextPageToken.
      */
-    public java.lang.String getNextPageToken() {
-      java.lang.Object ref = nextPageToken_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getNextPageToken() {
+      Object ref = nextPageToken_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         nextPageToken_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -1007,10 +976,10 @@ public java.lang.String getNextPageToken() {
      * @return The bytes for nextPageToken.
      */
     public com.google.protobuf.ByteString getNextPageTokenBytes() {
-      java.lang.Object ref = nextPageToken_;
+      Object ref = nextPageToken_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         nextPageToken_ = b;
         return b;
       } else {
@@ -1031,7 +1000,7 @@ public com.google.protobuf.ByteString getNextPageTokenBytes() {
      * @param value The nextPageToken to set.
      * @return This builder for chaining.
      */
-    public Builder setNextPageToken(java.lang.String value) {
+    public Builder setNextPageToken(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1084,12 +1053,12 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1099,19 +1068,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.ListSessionsResponse)
-  private static final com.google.spanner.v1.ListSessionsResponse DEFAULT_INSTANCE;
+  private static final ListSessionsResponse DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.ListSessionsResponse();
+    DEFAULT_INSTANCE = new ListSessionsResponse();
   }
 
-  public static com.google.spanner.v1.ListSessionsResponse getDefaultInstance() {
+  public static ListSessionsResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public ListSessionsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1124,13 +1093,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.ListSessionsResponse getDefaultInstanceForType() {
+  @Override
+  public ListSessionsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponseOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponseOrBuilder.java
index 3f42309cc3..06b753ed10 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponseOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponseOrBuilder.java
@@ -32,7 +32,7 @@ public interface ListSessionsResponseOrBuilder
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  java.util.List getSessionsList();
+  java.util.List getSessionsList();
   /**
    *
    *
@@ -42,7 +42,7 @@ public interface ListSessionsResponseOrBuilder
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  com.google.spanner.v1.Session getSessions(int index);
+  Session getSessions(int index);
   /**
    *
    *
@@ -62,7 +62,7 @@ public interface ListSessionsResponseOrBuilder
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  java.util.List getSessionsOrBuilderList();
+  java.util.List getSessionsOrBuilderList();
   /**
    *
    *
@@ -72,7 +72,7 @@ public interface ListSessionsResponseOrBuilder
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  com.google.spanner.v1.SessionOrBuilder getSessionsOrBuilder(int index);
+  SessionOrBuilder getSessionsOrBuilder(int index);
 
   /**
    *
@@ -87,7 +87,7 @@ public interface ListSessionsResponseOrBuilder
    *
    * @return The nextPageToken.
    */
-  java.lang.String getNextPageToken();
+  String getNextPageToken();
   /**
    *
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java
index 8d3222c5ee..3fabf13d2c 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java
@@ -41,13 +41,13 @@ private Mutation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
   private Mutation() {}
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new Mutation();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private Mutation(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -72,15 +72,13 @@ private Mutation(
             break;
           case 10:
             {
-              com.google.spanner.v1.Mutation.Write.Builder subBuilder = null;
+              Write.Builder subBuilder = null;
               if (operationCase_ == 1) {
-                subBuilder = ((com.google.spanner.v1.Mutation.Write) operation_).toBuilder();
+                subBuilder = ((Write) operation_).toBuilder();
               }
-              operation_ =
-                  input.readMessage(
-                      com.google.spanner.v1.Mutation.Write.parser(), extensionRegistry);
+              operation_ = input.readMessage(Write.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.spanner.v1.Mutation.Write) operation_);
+                subBuilder.mergeFrom((Write) operation_);
                 operation_ = subBuilder.buildPartial();
               }
               operationCase_ = 1;
@@ -88,15 +86,13 @@ private Mutation(
             }
           case 18:
             {
-              com.google.spanner.v1.Mutation.Write.Builder subBuilder = null;
+              Write.Builder subBuilder = null;
               if (operationCase_ == 2) {
-                subBuilder = ((com.google.spanner.v1.Mutation.Write) operation_).toBuilder();
+                subBuilder = ((Write) operation_).toBuilder();
               }
-              operation_ =
-                  input.readMessage(
-                      com.google.spanner.v1.Mutation.Write.parser(), extensionRegistry);
+              operation_ = input.readMessage(Write.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.spanner.v1.Mutation.Write) operation_);
+                subBuilder.mergeFrom((Write) operation_);
                 operation_ = subBuilder.buildPartial();
               }
               operationCase_ = 2;
@@ -104,15 +100,13 @@ private Mutation(
             }
           case 26:
             {
-              com.google.spanner.v1.Mutation.Write.Builder subBuilder = null;
+              Write.Builder subBuilder = null;
               if (operationCase_ == 3) {
-                subBuilder = ((com.google.spanner.v1.Mutation.Write) operation_).toBuilder();
+                subBuilder = ((Write) operation_).toBuilder();
               }
-              operation_ =
-                  input.readMessage(
-                      com.google.spanner.v1.Mutation.Write.parser(), extensionRegistry);
+              operation_ = input.readMessage(Write.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.spanner.v1.Mutation.Write) operation_);
+                subBuilder.mergeFrom((Write) operation_);
                 operation_ = subBuilder.buildPartial();
               }
               operationCase_ = 3;
@@ -120,15 +114,13 @@ private Mutation(
             }
           case 34:
             {
-              com.google.spanner.v1.Mutation.Write.Builder subBuilder = null;
+              Write.Builder subBuilder = null;
               if (operationCase_ == 4) {
-                subBuilder = ((com.google.spanner.v1.Mutation.Write) operation_).toBuilder();
+                subBuilder = ((Write) operation_).toBuilder();
               }
-              operation_ =
-                  input.readMessage(
-                      com.google.spanner.v1.Mutation.Write.parser(), extensionRegistry);
+              operation_ = input.readMessage(Write.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.spanner.v1.Mutation.Write) operation_);
+                subBuilder.mergeFrom((Write) operation_);
                 operation_ = subBuilder.buildPartial();
               }
               operationCase_ = 4;
@@ -136,15 +128,13 @@ private Mutation(
             }
           case 42:
             {
-              com.google.spanner.v1.Mutation.Delete.Builder subBuilder = null;
+              Delete.Builder subBuilder = null;
               if (operationCase_ == 5) {
-                subBuilder = ((com.google.spanner.v1.Mutation.Delete) operation_).toBuilder();
+                subBuilder = ((Delete) operation_).toBuilder();
               }
-              operation_ =
-                  input.readMessage(
-                      com.google.spanner.v1.Mutation.Delete.parser(), extensionRegistry);
+              operation_ = input.readMessage(Delete.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.spanner.v1.Mutation.Delete) operation_);
+                subBuilder.mergeFrom((Delete) operation_);
                 operation_ = subBuilder.buildPartial();
               }
               operationCase_ = 5;
@@ -170,17 +160,13 @@ private Mutation(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.MutationProto
-        .internal_static_google_spanner_v1_Mutation_descriptor;
+    return MutationProto.internal_static_google_spanner_v1_Mutation_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.MutationProto
-        .internal_static_google_spanner_v1_Mutation_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.Mutation.class, com.google.spanner.v1.Mutation.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return MutationProto.internal_static_google_spanner_v1_Mutation_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(Mutation.class, Builder.class);
   }
 
   public interface WriteOrBuilder
@@ -199,7 +185,7 @@ public interface WriteOrBuilder
      *
      * @return The table.
      */
-    java.lang.String getTable();
+    String getTable();
     /**
      *
      *
@@ -227,7 +213,7 @@ public interface WriteOrBuilder
      *
      * @return A list containing the columns.
      */
-    java.util.List getColumnsList();
+    java.util.List getColumnsList();
     /**
      *
      *
@@ -258,7 +244,7 @@ public interface WriteOrBuilder
      * @param index The index of the element to return.
      * @return The columns at the given index.
      */
-    java.lang.String getColumns(int index);
+    String getColumns(int index);
     /**
      *
      *
@@ -388,13 +374,13 @@ private Write() {
       values_ = java.util.Collections.emptyList();
     }
 
-    @java.lang.Override
+    @Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected Object newInstance(UnusedPrivateParameter unused) {
       return new Write();
     }
 
-    @java.lang.Override
+    @Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -405,7 +391,7 @@ private Write(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -420,14 +406,14 @@ private Write(
               break;
             case 10:
               {
-                java.lang.String s = input.readStringRequireUtf8();
+                String s = input.readStringRequireUtf8();
 
                 table_ = s;
                 break;
               }
             case 18:
               {
-                java.lang.String s = input.readStringRequireUtf8();
+                String s = input.readStringRequireUtf8();
                 if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                   columns_ = new com.google.protobuf.LazyStringArrayList();
                   mutable_bitField0_ |= 0x00000001;
@@ -471,22 +457,17 @@ private Write(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.MutationProto
-          .internal_static_google_spanner_v1_Mutation_Write_descriptor;
+      return MutationProto.internal_static_google_spanner_v1_Mutation_Write_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.MutationProto
-          .internal_static_google_spanner_v1_Mutation_Write_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.Mutation.Write.class,
-              com.google.spanner.v1.Mutation.Write.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return MutationProto.internal_static_google_spanner_v1_Mutation_Write_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(Write.class, Builder.class);
     }
 
     public static final int TABLE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object table_;
+    private volatile Object table_;
     /**
      *
      *
@@ -498,14 +479,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      *
      * @return The table.
      */
-    @java.lang.Override
-    public java.lang.String getTable() {
-      java.lang.Object ref = table_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
+    @Override
+    public String getTable() {
+      Object ref = table_;
+      if (ref instanceof String) {
+        return (String) ref;
       } else {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         table_ = s;
         return s;
       }
@@ -521,12 +502,12 @@ public java.lang.String getTable() {
      *
      * @return The bytes for table.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ByteString getTableBytes() {
-      java.lang.Object ref = table_;
-      if (ref instanceof java.lang.String) {
+      Object ref = table_;
+      if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         table_ = b;
         return b;
       } else {
@@ -585,7 +566,7 @@ public int getColumnsCount() {
      * @param index The index of the element to return.
      * @return The columns at the given index.
      */
-    public java.lang.String getColumns(int index) {
+    public String getColumns(int index) {
       return columns_.get(index);
     }
     /**
@@ -625,7 +606,7 @@ public com.google.protobuf.ByteString getColumnsBytes(int index) {
      *
      * repeated .google.protobuf.ListValue values = 3;
      */
-    @java.lang.Override
+    @Override
     public java.util.List getValuesList() {
       return values_;
     }
@@ -645,7 +626,7 @@ public java.util.List getValuesList() {
      *
      * repeated .google.protobuf.ListValue values = 3;
      */
-    @java.lang.Override
+    @Override
     public java.util.List
         getValuesOrBuilderList() {
       return values_;
@@ -666,7 +647,7 @@ public java.util.List getValuesList() {
      *
      * repeated .google.protobuf.ListValue values = 3;
      */
-    @java.lang.Override
+    @Override
     public int getValuesCount() {
       return values_.size();
     }
@@ -686,7 +667,7 @@ public int getValuesCount() {
      *
      * repeated .google.protobuf.ListValue values = 3;
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ListValue getValues(int index) {
       return values_.get(index);
     }
@@ -706,14 +687,14 @@ public com.google.protobuf.ListValue getValues(int index) {
      *
      * repeated .google.protobuf.ListValue values = 3;
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ListValueOrBuilder getValuesOrBuilder(int index) {
       return values_.get(index);
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -723,7 +704,7 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (!getTableBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, table_);
@@ -737,7 +718,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
+    @Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -762,15 +743,15 @@ public int getSerializedSize() {
       return size;
     }
 
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
+    @Override
+    public boolean equals(final Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof com.google.spanner.v1.Mutation.Write)) {
+      if (!(obj instanceof Write)) {
         return super.equals(obj);
       }
-      com.google.spanner.v1.Mutation.Write other = (com.google.spanner.v1.Mutation.Write) obj;
+      Write other = (Write) obj;
 
       if (!getTable().equals(other.getTable())) return false;
       if (!getColumnsList().equals(other.getColumnsList())) return false;
@@ -779,7 +760,7 @@ public boolean equals(final java.lang.Object obj) {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -801,71 +782,68 @@ public int hashCode() {
       return hash;
     }
 
-    public static com.google.spanner.v1.Mutation.Write parseFrom(java.nio.ByteBuffer data)
+    public static Write parseFrom(java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.Mutation.Write parseFrom(
+    public static Write parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.Mutation.Write parseFrom(
-        com.google.protobuf.ByteString data)
+    public static Write parseFrom(com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.Mutation.Write parseFrom(
+    public static Write 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.spanner.v1.Mutation.Write parseFrom(byte[] data)
+    public static Write parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.Mutation.Write parseFrom(
+    public static Write parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.Mutation.Write parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
+    public static Write parseFrom(java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.Mutation.Write parseFrom(
+    public static Write 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.spanner.v1.Mutation.Write parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
+    public static Write parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.Mutation.Write parseDelimitedFrom(
+    public static Write 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.spanner.v1.Mutation.Write parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    public static Write parseFrom(com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.Mutation.Write parseFrom(
+    public static Write parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -873,7 +851,7 @@ public static com.google.spanner.v1.Mutation.Write parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
+    @Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -882,18 +860,17 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(com.google.spanner.v1.Mutation.Write prototype) {
+    public static Builder newBuilder(Write prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @java.lang.Override
+    @Override
     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) {
+    @Override
+    protected Builder newBuilderForType(BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -911,20 +888,15 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.Mutation.Write)
-        com.google.spanner.v1.Mutation.WriteOrBuilder {
+        WriteOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return com.google.spanner.v1.MutationProto
-            .internal_static_google_spanner_v1_Mutation_Write_descriptor;
+        return MutationProto.internal_static_google_spanner_v1_Mutation_Write_descriptor;
       }
 
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.spanner.v1.MutationProto
-            .internal_static_google_spanner_v1_Mutation_Write_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.spanner.v1.Mutation.Write.class,
-                com.google.spanner.v1.Mutation.Write.Builder.class);
+      @Override
+      protected FieldAccessorTable internalGetFieldAccessorTable() {
+        return MutationProto.internal_static_google_spanner_v1_Mutation_Write_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(Write.class, Builder.class);
       }
 
       // Construct using com.google.spanner.v1.Mutation.Write.newBuilder()
@@ -932,7 +904,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -943,7 +915,7 @@ private void maybeForceBuilderInitialization() {
         }
       }
 
-      @java.lang.Override
+      @Override
       public Builder clear() {
         super.clear();
         table_ = "";
@@ -959,30 +931,28 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return com.google.spanner.v1.MutationProto
-            .internal_static_google_spanner_v1_Mutation_Write_descriptor;
+        return MutationProto.internal_static_google_spanner_v1_Mutation_Write_descriptor;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.Mutation.Write getDefaultInstanceForType() {
-        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+      @Override
+      public Write getDefaultInstanceForType() {
+        return Write.getDefaultInstance();
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.Mutation.Write build() {
-        com.google.spanner.v1.Mutation.Write result = buildPartial();
+      @Override
+      public Write build() {
+        Write result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.Mutation.Write buildPartial() {
-        com.google.spanner.v1.Mutation.Write result =
-            new com.google.spanner.v1.Mutation.Write(this);
+      @Override
+      public Write buildPartial() {
+        Write result = new Write(this);
         int from_bitField0_ = bitField0_;
         result.table_ = table_;
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -1003,53 +973,50 @@ public com.google.spanner.v1.Mutation.Write buildPartial() {
         return result;
       }
 
-      @java.lang.Override
+      @Override
       public Builder clone() {
         return super.clone();
       }
 
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      @Override
+      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.setField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @java.lang.Override
+      @Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.spanner.v1.Mutation.Write) {
-          return mergeFrom((com.google.spanner.v1.Mutation.Write) other);
+        if (other instanceof Write) {
+          return mergeFrom((Write) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.google.spanner.v1.Mutation.Write other) {
-        if (other == com.google.spanner.v1.Mutation.Write.getDefaultInstance()) return this;
+      public Builder mergeFrom(Write other) {
+        if (other == Write.getDefaultInstance()) return this;
         if (!other.getTable().isEmpty()) {
           table_ = other.table_;
           onChanged();
@@ -1096,21 +1063,21 @@ public Builder mergeFrom(com.google.spanner.v1.Mutation.Write other) {
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.spanner.v1.Mutation.Write parsedMessage = null;
+        Write parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.spanner.v1.Mutation.Write) e.getUnfinishedMessage();
+          parsedMessage = (Write) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1122,7 +1089,7 @@ public Builder mergeFrom(
 
       private int bitField0_;
 
-      private java.lang.Object table_ = "";
+      private Object table_ = "";
       /**
        *
        *
@@ -1134,15 +1101,15 @@ public Builder mergeFrom(
        *
        * @return The table.
        */
-      public java.lang.String getTable() {
-        java.lang.Object ref = table_;
-        if (!(ref instanceof java.lang.String)) {
+      public String getTable() {
+        Object ref = table_;
+        if (!(ref instanceof String)) {
           com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
+          String s = bs.toStringUtf8();
           table_ = s;
           return s;
         } else {
-          return (java.lang.String) ref;
+          return (String) ref;
         }
       }
       /**
@@ -1157,10 +1124,10 @@ public java.lang.String getTable() {
        * @return The bytes for table.
        */
       public com.google.protobuf.ByteString getTableBytes() {
-        java.lang.Object ref = table_;
+        Object ref = table_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+              com.google.protobuf.ByteString.copyFromUtf8((String) ref);
           table_ = b;
           return b;
         } else {
@@ -1179,7 +1146,7 @@ public com.google.protobuf.ByteString getTableBytes() {
        * @param value The table to set.
        * @return This builder for chaining.
        */
-      public Builder setTable(java.lang.String value) {
+      public Builder setTable(String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1286,7 +1253,7 @@ public int getColumnsCount() {
        * @param index The index of the element to return.
        * @return The columns at the given index.
        */
-      public java.lang.String getColumns(int index) {
+      public String getColumns(int index) {
         return columns_.get(index);
       }
       /**
@@ -1323,7 +1290,7 @@ public com.google.protobuf.ByteString getColumnsBytes(int index) {
        * @param value The columns to set.
        * @return This builder for chaining.
        */
-      public Builder setColumns(int index, java.lang.String value) {
+      public Builder setColumns(int index, String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1347,7 +1314,7 @@ public Builder setColumns(int index, java.lang.String value) {
        * @param value The columns to add.
        * @return This builder for chaining.
        */
-      public Builder addColumns(java.lang.String value) {
+      public Builder addColumns(String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1371,7 +1338,7 @@ public Builder addColumns(java.lang.String value) {
        * @param values The columns to add.
        * @return This builder for chaining.
        */
-      public Builder addAllColumns(java.lang.Iterable values) {
+      public Builder addAllColumns(Iterable values) {
         ensureColumnsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, columns_);
         onChanged();
@@ -1689,8 +1656,7 @@ public Builder addValues(int index, com.google.protobuf.ListValue.Builder builde
        *
        * repeated .google.protobuf.ListValue values = 3;
        */
-      public Builder addAllValues(
-          java.lang.Iterable values) {
+      public Builder addAllValues(Iterable values) {
         if (valuesBuilder_ == null) {
           ensureValuesIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(values, values_);
@@ -1895,13 +1861,13 @@ public java.util.List getValuesBuilderLis
         return valuesBuilder_;
       }
 
-      @java.lang.Override
+      @Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @java.lang.Override
+      @Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1911,19 +1877,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.Mutation.Write)
-    private static final com.google.spanner.v1.Mutation.Write DEFAULT_INSTANCE;
+    private static final Write DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new com.google.spanner.v1.Mutation.Write();
+      DEFAULT_INSTANCE = new Write();
     }
 
-    public static com.google.spanner.v1.Mutation.Write getDefaultInstance() {
+    public static Write getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @java.lang.Override
+          @Override
           public Write parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1936,13 +1902,13 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation.Write getDefaultInstanceForType() {
+    @Override
+    public Write getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
@@ -1963,7 +1929,7 @@ public interface DeleteOrBuilder
      *
      * @return The table.
      */
-    java.lang.String getTable();
+    String getTable();
     /**
      *
      *
@@ -2010,7 +1976,7 @@ public interface DeleteOrBuilder
      *
      * @return The keySet.
      */
-    com.google.spanner.v1.KeySet getKeySet();
+    KeySet getKeySet();
     /**
      *
      *
@@ -2025,7 +1991,7 @@ public interface DeleteOrBuilder
      *
      * .google.spanner.v1.KeySet key_set = 2;
      */
-    com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder();
+    KeySetOrBuilder getKeySetOrBuilder();
   }
   /**
    *
@@ -2050,13 +2016,13 @@ private Delete() {
       table_ = "";
     }
 
-    @java.lang.Override
+    @Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected Object newInstance(UnusedPrivateParameter unused) {
       return new Delete();
     }
 
-    @java.lang.Override
+    @Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -2067,7 +2033,7 @@ private Delete(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2081,19 +2047,18 @@ private Delete(
               break;
             case 10:
               {
-                java.lang.String s = input.readStringRequireUtf8();
+                String s = input.readStringRequireUtf8();
 
                 table_ = s;
                 break;
               }
             case 18:
               {
-                com.google.spanner.v1.KeySet.Builder subBuilder = null;
+                KeySet.Builder subBuilder = null;
                 if (keySet_ != null) {
                   subBuilder = keySet_.toBuilder();
                 }
-                keySet_ =
-                    input.readMessage(com.google.spanner.v1.KeySet.parser(), extensionRegistry);
+                keySet_ = input.readMessage(KeySet.parser(), extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(keySet_);
                   keySet_ = subBuilder.buildPartial();
@@ -2121,22 +2086,17 @@ private Delete(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.MutationProto
-          .internal_static_google_spanner_v1_Mutation_Delete_descriptor;
+      return MutationProto.internal_static_google_spanner_v1_Mutation_Delete_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.MutationProto
-          .internal_static_google_spanner_v1_Mutation_Delete_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.Mutation.Delete.class,
-              com.google.spanner.v1.Mutation.Delete.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return MutationProto.internal_static_google_spanner_v1_Mutation_Delete_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(Delete.class, Builder.class);
     }
 
     public static final int TABLE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object table_;
+    private volatile Object table_;
     /**
      *
      *
@@ -2148,14 +2108,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      *
      * @return The table.
      */
-    @java.lang.Override
-    public java.lang.String getTable() {
-      java.lang.Object ref = table_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
+    @Override
+    public String getTable() {
+      Object ref = table_;
+      if (ref instanceof String) {
+        return (String) ref;
       } else {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         table_ = s;
         return s;
       }
@@ -2171,12 +2131,12 @@ public java.lang.String getTable() {
      *
      * @return The bytes for table.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ByteString getTableBytes() {
-      java.lang.Object ref = table_;
-      if (ref instanceof java.lang.String) {
+      Object ref = table_;
+      if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         table_ = b;
         return b;
       } else {
@@ -2185,7 +2145,7 @@ public com.google.protobuf.ByteString getTableBytes() {
     }
 
     public static final int KEY_SET_FIELD_NUMBER = 2;
-    private com.google.spanner.v1.KeySet keySet_;
+    private KeySet keySet_;
     /**
      *
      *
@@ -2202,7 +2162,7 @@ public com.google.protobuf.ByteString getTableBytes() {
      *
      * @return Whether the keySet field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasKeySet() {
       return keySet_ != null;
     }
@@ -2222,9 +2182,9 @@ public boolean hasKeySet() {
      *
      * @return The keySet.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.KeySet getKeySet() {
-      return keySet_ == null ? com.google.spanner.v1.KeySet.getDefaultInstance() : keySet_;
+    @Override
+    public KeySet getKeySet() {
+      return keySet_ == null ? KeySet.getDefaultInstance() : keySet_;
     }
     /**
      *
@@ -2240,14 +2200,14 @@ public com.google.spanner.v1.KeySet getKeySet() {
      *
      * .google.spanner.v1.KeySet key_set = 2;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
+    @Override
+    public KeySetOrBuilder getKeySetOrBuilder() {
       return getKeySet();
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2257,7 +2217,7 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (!getTableBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, table_);
@@ -2268,7 +2228,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
+    @Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2285,15 +2245,15 @@ public int getSerializedSize() {
       return size;
     }
 
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
+    @Override
+    public boolean equals(final Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof com.google.spanner.v1.Mutation.Delete)) {
+      if (!(obj instanceof Delete)) {
         return super.equals(obj);
       }
-      com.google.spanner.v1.Mutation.Delete other = (com.google.spanner.v1.Mutation.Delete) obj;
+      Delete other = (Delete) obj;
 
       if (!getTable().equals(other.getTable())) return false;
       if (hasKeySet() != other.hasKeySet()) return false;
@@ -2304,7 +2264,7 @@ public boolean equals(final java.lang.Object obj) {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -2322,71 +2282,68 @@ public int hashCode() {
       return hash;
     }
 
-    public static com.google.spanner.v1.Mutation.Delete parseFrom(java.nio.ByteBuffer data)
+    public static Delete parseFrom(java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.Mutation.Delete parseFrom(
+    public static Delete parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.Mutation.Delete parseFrom(
-        com.google.protobuf.ByteString data)
+    public static Delete parseFrom(com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.Mutation.Delete parseFrom(
+    public static Delete 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.spanner.v1.Mutation.Delete parseFrom(byte[] data)
+    public static Delete parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.Mutation.Delete parseFrom(
+    public static Delete parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.Mutation.Delete parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
+    public static Delete parseFrom(java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.Mutation.Delete parseFrom(
+    public static Delete 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.spanner.v1.Mutation.Delete parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
+    public static Delete parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.Mutation.Delete parseDelimitedFrom(
+    public static Delete 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.spanner.v1.Mutation.Delete parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    public static Delete parseFrom(com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.Mutation.Delete parseFrom(
+    public static Delete parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2394,7 +2351,7 @@ public static com.google.spanner.v1.Mutation.Delete parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
+    @Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -2403,18 +2360,17 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(com.google.spanner.v1.Mutation.Delete prototype) {
+    public static Builder newBuilder(Delete prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @java.lang.Override
+    @Override
     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) {
+    @Override
+    protected Builder newBuilderForType(BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -2431,20 +2387,15 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.Mutation.Delete)
-        com.google.spanner.v1.Mutation.DeleteOrBuilder {
+        DeleteOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return com.google.spanner.v1.MutationProto
-            .internal_static_google_spanner_v1_Mutation_Delete_descriptor;
+        return MutationProto.internal_static_google_spanner_v1_Mutation_Delete_descriptor;
       }
 
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.spanner.v1.MutationProto
-            .internal_static_google_spanner_v1_Mutation_Delete_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.spanner.v1.Mutation.Delete.class,
-                com.google.spanner.v1.Mutation.Delete.Builder.class);
+      @Override
+      protected FieldAccessorTable internalGetFieldAccessorTable() {
+        return MutationProto.internal_static_google_spanner_v1_Mutation_Delete_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(Delete.class, Builder.class);
       }
 
       // Construct using com.google.spanner.v1.Mutation.Delete.newBuilder()
@@ -2452,7 +2403,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -2461,7 +2412,7 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @java.lang.Override
+      @Override
       public Builder clear() {
         super.clear();
         table_ = "";
@@ -2475,30 +2426,28 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return com.google.spanner.v1.MutationProto
-            .internal_static_google_spanner_v1_Mutation_Delete_descriptor;
+        return MutationProto.internal_static_google_spanner_v1_Mutation_Delete_descriptor;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.Mutation.Delete getDefaultInstanceForType() {
-        return com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
+      @Override
+      public Delete getDefaultInstanceForType() {
+        return Delete.getDefaultInstance();
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.Mutation.Delete build() {
-        com.google.spanner.v1.Mutation.Delete result = buildPartial();
+      @Override
+      public Delete build() {
+        Delete result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.Mutation.Delete buildPartial() {
-        com.google.spanner.v1.Mutation.Delete result =
-            new com.google.spanner.v1.Mutation.Delete(this);
+      @Override
+      public Delete buildPartial() {
+        Delete result = new Delete(this);
         result.table_ = table_;
         if (keySetBuilder_ == null) {
           result.keySet_ = keySet_;
@@ -2509,53 +2458,50 @@ public com.google.spanner.v1.Mutation.Delete buildPartial() {
         return result;
       }
 
-      @java.lang.Override
+      @Override
       public Builder clone() {
         return super.clone();
       }
 
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      @Override
+      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.setField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @java.lang.Override
+      @Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.spanner.v1.Mutation.Delete) {
-          return mergeFrom((com.google.spanner.v1.Mutation.Delete) other);
+        if (other instanceof Delete) {
+          return mergeFrom((Delete) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.google.spanner.v1.Mutation.Delete other) {
-        if (other == com.google.spanner.v1.Mutation.Delete.getDefaultInstance()) return this;
+      public Builder mergeFrom(Delete other) {
+        if (other == Delete.getDefaultInstance()) return this;
         if (!other.getTable().isEmpty()) {
           table_ = other.table_;
           onChanged();
@@ -2568,21 +2514,21 @@ public Builder mergeFrom(com.google.spanner.v1.Mutation.Delete other) {
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.spanner.v1.Mutation.Delete parsedMessage = null;
+        Delete parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.spanner.v1.Mutation.Delete) e.getUnfinishedMessage();
+          parsedMessage = (Delete) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2592,7 +2538,7 @@ public Builder mergeFrom(
         return this;
       }
 
-      private java.lang.Object table_ = "";
+      private Object table_ = "";
       /**
        *
        *
@@ -2604,15 +2550,15 @@ public Builder mergeFrom(
        *
        * @return The table.
        */
-      public java.lang.String getTable() {
-        java.lang.Object ref = table_;
-        if (!(ref instanceof java.lang.String)) {
+      public String getTable() {
+        Object ref = table_;
+        if (!(ref instanceof String)) {
           com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
+          String s = bs.toStringUtf8();
           table_ = s;
           return s;
         } else {
-          return (java.lang.String) ref;
+          return (String) ref;
         }
       }
       /**
@@ -2627,10 +2573,10 @@ public java.lang.String getTable() {
        * @return The bytes for table.
        */
       public com.google.protobuf.ByteString getTableBytes() {
-        java.lang.Object ref = table_;
+        Object ref = table_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+              com.google.protobuf.ByteString.copyFromUtf8((String) ref);
           table_ = b;
           return b;
         } else {
@@ -2649,7 +2595,7 @@ public com.google.protobuf.ByteString getTableBytes() {
        * @param value The table to set.
        * @return This builder for chaining.
        */
-      public Builder setTable(java.lang.String value) {
+      public Builder setTable(String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2698,11 +2644,8 @@ public Builder setTableBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private com.google.spanner.v1.KeySet keySet_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-              com.google.spanner.v1.KeySet,
-              com.google.spanner.v1.KeySet.Builder,
-              com.google.spanner.v1.KeySetOrBuilder>
+      private KeySet keySet_;
+      private com.google.protobuf.SingleFieldBuilderV3
           keySetBuilder_;
       /**
        *
@@ -2739,9 +2682,9 @@ public boolean hasKeySet() {
        *
        * @return The keySet.
        */
-      public com.google.spanner.v1.KeySet getKeySet() {
+      public KeySet getKeySet() {
         if (keySetBuilder_ == null) {
-          return keySet_ == null ? com.google.spanner.v1.KeySet.getDefaultInstance() : keySet_;
+          return keySet_ == null ? KeySet.getDefaultInstance() : keySet_;
         } else {
           return keySetBuilder_.getMessage();
         }
@@ -2760,7 +2703,7 @@ public com.google.spanner.v1.KeySet getKeySet() {
        *
        * .google.spanner.v1.KeySet key_set = 2;
        */
-      public Builder setKeySet(com.google.spanner.v1.KeySet value) {
+      public Builder setKeySet(KeySet value) {
         if (keySetBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2787,7 +2730,7 @@ public Builder setKeySet(com.google.spanner.v1.KeySet value) {
        *
        * .google.spanner.v1.KeySet key_set = 2;
        */
-      public Builder setKeySet(com.google.spanner.v1.KeySet.Builder builderForValue) {
+      public Builder setKeySet(KeySet.Builder builderForValue) {
         if (keySetBuilder_ == null) {
           keySet_ = builderForValue.build();
           onChanged();
@@ -2811,11 +2754,10 @@ public Builder setKeySet(com.google.spanner.v1.KeySet.Builder builderForValue) {
        *
        * .google.spanner.v1.KeySet key_set = 2;
        */
-      public Builder mergeKeySet(com.google.spanner.v1.KeySet value) {
+      public Builder mergeKeySet(KeySet value) {
         if (keySetBuilder_ == null) {
           if (keySet_ != null) {
-            keySet_ =
-                com.google.spanner.v1.KeySet.newBuilder(keySet_).mergeFrom(value).buildPartial();
+            keySet_ = KeySet.newBuilder(keySet_).mergeFrom(value).buildPartial();
           } else {
             keySet_ = value;
           }
@@ -2865,7 +2807,7 @@ public Builder clearKeySet() {
        *
        * .google.spanner.v1.KeySet key_set = 2;
        */
-      public com.google.spanner.v1.KeySet.Builder getKeySetBuilder() {
+      public KeySet.Builder getKeySetBuilder() {
 
         onChanged();
         return getKeySetFieldBuilder().getBuilder();
@@ -2884,11 +2826,11 @@ public com.google.spanner.v1.KeySet.Builder getKeySetBuilder() {
        *
        * .google.spanner.v1.KeySet key_set = 2;
        */
-      public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
+      public KeySetOrBuilder getKeySetOrBuilder() {
         if (keySetBuilder_ != null) {
           return keySetBuilder_.getMessageOrBuilder();
         } else {
-          return keySet_ == null ? com.google.spanner.v1.KeySet.getDefaultInstance() : keySet_;
+          return keySet_ == null ? KeySet.getDefaultInstance() : keySet_;
         }
       }
       /**
@@ -2905,30 +2847,24 @@ public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
        *
        * .google.spanner.v1.KeySet key_set = 2;
        */
-      private com.google.protobuf.SingleFieldBuilderV3<
-              com.google.spanner.v1.KeySet,
-              com.google.spanner.v1.KeySet.Builder,
-              com.google.spanner.v1.KeySetOrBuilder>
+      private com.google.protobuf.SingleFieldBuilderV3
           getKeySetFieldBuilder() {
         if (keySetBuilder_ == null) {
           keySetBuilder_ =
-              new com.google.protobuf.SingleFieldBuilderV3<
-                  com.google.spanner.v1.KeySet,
-                  com.google.spanner.v1.KeySet.Builder,
-                  com.google.spanner.v1.KeySetOrBuilder>(
+              new com.google.protobuf.SingleFieldBuilderV3(
                   getKeySet(), getParentForChildren(), isClean());
           keySet_ = null;
         }
         return keySetBuilder_;
       }
 
-      @java.lang.Override
+      @Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @java.lang.Override
+      @Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2938,19 +2874,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.Mutation.Delete)
-    private static final com.google.spanner.v1.Mutation.Delete DEFAULT_INSTANCE;
+    private static final Delete DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new com.google.spanner.v1.Mutation.Delete();
+      DEFAULT_INSTANCE = new Delete();
     }
 
-    public static com.google.spanner.v1.Mutation.Delete getDefaultInstance() {
+    public static Delete getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @java.lang.Override
+          @Override
           public Delete parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2963,24 +2899,21 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation.Delete getDefaultInstanceForType() {
+    @Override
+    public Delete getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
 
   private int operationCase_ = 0;
-  private java.lang.Object operation_;
+  private Object operation_;
 
-  public enum OperationCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
-          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+  public enum OperationCase implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
     INSERT(1),
     UPDATE(2),
     INSERT_OR_UPDATE(3),
@@ -2997,7 +2930,7 @@ private OperationCase(int value) {
      * @return The enum associated with the given number.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @java.lang.Deprecated
+    @Deprecated
     public static OperationCase valueOf(int value) {
       return forNumber(value);
     }
@@ -3043,7 +2976,7 @@ public OperationCase getOperationCase() {
    *
    * @return Whether the insert field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasInsert() {
     return operationCase_ == 1;
   }
@@ -3059,12 +2992,12 @@ public boolean hasInsert() {
    *
    * @return The insert.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Mutation.Write getInsert() {
+  @Override
+  public Write getInsert() {
     if (operationCase_ == 1) {
-      return (com.google.spanner.v1.Mutation.Write) operation_;
+      return (Write) operation_;
     }
-    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+    return Write.getDefaultInstance();
   }
   /**
    *
@@ -3076,12 +3009,12 @@ public com.google.spanner.v1.Mutation.Write getInsert() {
    *
    * .google.spanner.v1.Mutation.Write insert = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrBuilder() {
+  @Override
+  public WriteOrBuilder getInsertOrBuilder() {
     if (operationCase_ == 1) {
-      return (com.google.spanner.v1.Mutation.Write) operation_;
+      return (Write) operation_;
     }
-    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+    return Write.getDefaultInstance();
   }
 
   public static final int UPDATE_FIELD_NUMBER = 2;
@@ -3097,7 +3030,7 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrBuilder() {
    *
    * @return Whether the update field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasUpdate() {
     return operationCase_ == 2;
   }
@@ -3113,12 +3046,12 @@ public boolean hasUpdate() {
    *
    * @return The update.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Mutation.Write getUpdate() {
+  @Override
+  public Write getUpdate() {
     if (operationCase_ == 2) {
-      return (com.google.spanner.v1.Mutation.Write) operation_;
+      return (Write) operation_;
     }
-    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+    return Write.getDefaultInstance();
   }
   /**
    *
@@ -3130,12 +3063,12 @@ public com.google.spanner.v1.Mutation.Write getUpdate() {
    *
    * .google.spanner.v1.Mutation.Write update = 2;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Mutation.WriteOrBuilder getUpdateOrBuilder() {
+  @Override
+  public WriteOrBuilder getUpdateOrBuilder() {
     if (operationCase_ == 2) {
-      return (com.google.spanner.v1.Mutation.Write) operation_;
+      return (Write) operation_;
     }
-    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+    return Write.getDefaultInstance();
   }
 
   public static final int INSERT_OR_UPDATE_FIELD_NUMBER = 3;
@@ -3155,7 +3088,7 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getUpdateOrBuilder() {
    *
    * @return Whether the insertOrUpdate field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasInsertOrUpdate() {
     return operationCase_ == 3;
   }
@@ -3175,12 +3108,12 @@ public boolean hasInsertOrUpdate() {
    *
    * @return The insertOrUpdate.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Mutation.Write getInsertOrUpdate() {
+  @Override
+  public Write getInsertOrUpdate() {
     if (operationCase_ == 3) {
-      return (com.google.spanner.v1.Mutation.Write) operation_;
+      return (Write) operation_;
     }
-    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+    return Write.getDefaultInstance();
   }
   /**
    *
@@ -3196,12 +3129,12 @@ public com.google.spanner.v1.Mutation.Write getInsertOrUpdate() {
    *
    * .google.spanner.v1.Mutation.Write insert_or_update = 3;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrUpdateOrBuilder() {
+  @Override
+  public WriteOrBuilder getInsertOrUpdateOrBuilder() {
     if (operationCase_ == 3) {
-      return (com.google.spanner.v1.Mutation.Write) operation_;
+      return (Write) operation_;
     }
-    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+    return Write.getDefaultInstance();
   }
 
   public static final int REPLACE_FIELD_NUMBER = 4;
@@ -3223,7 +3156,7 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrUpdateOrBuilder(
    *
    * @return Whether the replace field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasReplace() {
     return operationCase_ == 4;
   }
@@ -3245,12 +3178,12 @@ public boolean hasReplace() {
    *
    * @return The replace.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Mutation.Write getReplace() {
+  @Override
+  public Write getReplace() {
     if (operationCase_ == 4) {
-      return (com.google.spanner.v1.Mutation.Write) operation_;
+      return (Write) operation_;
     }
-    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+    return Write.getDefaultInstance();
   }
   /**
    *
@@ -3268,12 +3201,12 @@ public com.google.spanner.v1.Mutation.Write getReplace() {
    *
    * .google.spanner.v1.Mutation.Write replace = 4;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Mutation.WriteOrBuilder getReplaceOrBuilder() {
+  @Override
+  public WriteOrBuilder getReplaceOrBuilder() {
     if (operationCase_ == 4) {
-      return (com.google.spanner.v1.Mutation.Write) operation_;
+      return (Write) operation_;
     }
-    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+    return Write.getDefaultInstance();
   }
 
   public static final int DELETE_FIELD_NUMBER = 5;
@@ -3289,7 +3222,7 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getReplaceOrBuilder() {
    *
    * @return Whether the delete field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasDelete() {
     return operationCase_ == 5;
   }
@@ -3305,12 +3238,12 @@ public boolean hasDelete() {
    *
    * @return The delete.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Mutation.Delete getDelete() {
+  @Override
+  public Delete getDelete() {
     if (operationCase_ == 5) {
-      return (com.google.spanner.v1.Mutation.Delete) operation_;
+      return (Delete) operation_;
     }
-    return com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
+    return Delete.getDefaultInstance();
   }
   /**
    *
@@ -3322,17 +3255,17 @@ public com.google.spanner.v1.Mutation.Delete getDelete() {
    *
    * .google.spanner.v1.Mutation.Delete delete = 5;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Mutation.DeleteOrBuilder getDeleteOrBuilder() {
+  @Override
+  public DeleteOrBuilder getDeleteOrBuilder() {
     if (operationCase_ == 5) {
-      return (com.google.spanner.v1.Mutation.Delete) operation_;
+      return (Delete) operation_;
     }
-    return com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
+    return Delete.getDefaultInstance();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -3342,71 +3275,61 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (operationCase_ == 1) {
-      output.writeMessage(1, (com.google.spanner.v1.Mutation.Write) operation_);
+      output.writeMessage(1, (Write) operation_);
     }
     if (operationCase_ == 2) {
-      output.writeMessage(2, (com.google.spanner.v1.Mutation.Write) operation_);
+      output.writeMessage(2, (Write) operation_);
     }
     if (operationCase_ == 3) {
-      output.writeMessage(3, (com.google.spanner.v1.Mutation.Write) operation_);
+      output.writeMessage(3, (Write) operation_);
     }
     if (operationCase_ == 4) {
-      output.writeMessage(4, (com.google.spanner.v1.Mutation.Write) operation_);
+      output.writeMessage(4, (Write) operation_);
     }
     if (operationCase_ == 5) {
-      output.writeMessage(5, (com.google.spanner.v1.Mutation.Delete) operation_);
+      output.writeMessage(5, (Delete) operation_);
     }
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
     if (operationCase_ == 1) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              1, (com.google.spanner.v1.Mutation.Write) operation_);
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, (Write) operation_);
     }
     if (operationCase_ == 2) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              2, (com.google.spanner.v1.Mutation.Write) operation_);
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, (Write) operation_);
     }
     if (operationCase_ == 3) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              3, (com.google.spanner.v1.Mutation.Write) operation_);
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, (Write) operation_);
     }
     if (operationCase_ == 4) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              4, (com.google.spanner.v1.Mutation.Write) operation_);
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, (Write) operation_);
     }
     if (operationCase_ == 5) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              5, (com.google.spanner.v1.Mutation.Delete) operation_);
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, (Delete) operation_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.Mutation)) {
+    if (!(obj instanceof Mutation)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.Mutation other = (com.google.spanner.v1.Mutation) obj;
+    Mutation other = (Mutation) obj;
 
     if (!getOperationCase().equals(other.getOperationCase())) return false;
     switch (operationCase_) {
@@ -3432,7 +3355,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -3468,70 +3391,68 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.Mutation parseFrom(java.nio.ByteBuffer data)
+  public static Mutation parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Mutation parseFrom(
+  public static Mutation parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.Mutation parseFrom(com.google.protobuf.ByteString data)
+  public static Mutation parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Mutation parseFrom(
+  public static Mutation 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.spanner.v1.Mutation parseFrom(byte[] data)
+  public static Mutation parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Mutation parseFrom(
+  public static Mutation parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.Mutation parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static Mutation parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Mutation parseFrom(
+  public static Mutation 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.spanner.v1.Mutation parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static Mutation parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Mutation parseDelimitedFrom(
+  public static Mutation 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.spanner.v1.Mutation parseFrom(com.google.protobuf.CodedInputStream input)
+  public static Mutation parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Mutation parseFrom(
+  public static Mutation parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -3539,7 +3460,7 @@ public static com.google.spanner.v1.Mutation parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -3548,17 +3469,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.Mutation prototype) {
+  public static Builder newBuilder(Mutation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -3576,19 +3497,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.Mutation)
-      com.google.spanner.v1.MutationOrBuilder {
+      MutationOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.MutationProto
-          .internal_static_google_spanner_v1_Mutation_descriptor;
+      return MutationProto.internal_static_google_spanner_v1_Mutation_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.MutationProto
-          .internal_static_google_spanner_v1_Mutation_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.Mutation.class, com.google.spanner.v1.Mutation.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return MutationProto.internal_static_google_spanner_v1_Mutation_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(Mutation.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.Mutation.newBuilder()
@@ -3596,7 +3513,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -3605,7 +3522,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       operationCase_ = 0;
@@ -3613,29 +3530,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.MutationProto
-          .internal_static_google_spanner_v1_Mutation_descriptor;
+      return MutationProto.internal_static_google_spanner_v1_Mutation_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation getDefaultInstanceForType() {
-      return com.google.spanner.v1.Mutation.getDefaultInstance();
+    @Override
+    public Mutation getDefaultInstanceForType() {
+      return Mutation.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation build() {
-      com.google.spanner.v1.Mutation result = buildPartial();
+    @Override
+    public Mutation build() {
+      Mutation result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation buildPartial() {
-      com.google.spanner.v1.Mutation result = new com.google.spanner.v1.Mutation(this);
+    @Override
+    public Mutation buildPartial() {
+      Mutation result = new Mutation(this);
       if (operationCase_ == 1) {
         if (insertBuilder_ == null) {
           result.operation_ = operation_;
@@ -3676,51 +3592,50 @@ public com.google.spanner.v1.Mutation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.Mutation) {
-        return mergeFrom((com.google.spanner.v1.Mutation) other);
+      if (other instanceof Mutation) {
+        return mergeFrom((Mutation) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.Mutation other) {
-      if (other == com.google.spanner.v1.Mutation.getDefaultInstance()) return this;
+    public Builder mergeFrom(Mutation other) {
+      if (other == Mutation.getDefaultInstance()) return this;
       switch (other.getOperationCase()) {
         case INSERT:
           {
@@ -3757,21 +3672,21 @@ public Builder mergeFrom(com.google.spanner.v1.Mutation other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.Mutation parsedMessage = null;
+      Mutation parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.Mutation) e.getUnfinishedMessage();
+        parsedMessage = (Mutation) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -3782,7 +3697,7 @@ public Builder mergeFrom(
     }
 
     private int operationCase_ = 0;
-    private java.lang.Object operation_;
+    private Object operation_;
 
     public OperationCase getOperationCase() {
       return OperationCase.forNumber(operationCase_);
@@ -3795,10 +3710,7 @@ public Builder clearOperation() {
       return this;
     }
 
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Mutation.Write,
-            com.google.spanner.v1.Mutation.Write.Builder,
-            com.google.spanner.v1.Mutation.WriteOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         insertBuilder_;
     /**
      *
@@ -3812,7 +3724,7 @@ public Builder clearOperation() {
      *
      * @return Whether the insert field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasInsert() {
       return operationCase_ == 1;
     }
@@ -3828,18 +3740,18 @@ public boolean hasInsert() {
      *
      * @return The insert.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation.Write getInsert() {
+    @Override
+    public Write getInsert() {
       if (insertBuilder_ == null) {
         if (operationCase_ == 1) {
-          return (com.google.spanner.v1.Mutation.Write) operation_;
+          return (Write) operation_;
         }
-        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+        return Write.getDefaultInstance();
       } else {
         if (operationCase_ == 1) {
           return insertBuilder_.getMessage();
         }
-        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+        return Write.getDefaultInstance();
       }
     }
     /**
@@ -3852,7 +3764,7 @@ public com.google.spanner.v1.Mutation.Write getInsert() {
      *
      * .google.spanner.v1.Mutation.Write insert = 1;
      */
-    public Builder setInsert(com.google.spanner.v1.Mutation.Write value) {
+    public Builder setInsert(Write value) {
       if (insertBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -3875,7 +3787,7 @@ public Builder setInsert(com.google.spanner.v1.Mutation.Write value) {
      *
      * .google.spanner.v1.Mutation.Write insert = 1;
      */
-    public Builder setInsert(com.google.spanner.v1.Mutation.Write.Builder builderForValue) {
+    public Builder setInsert(Write.Builder builderForValue) {
       if (insertBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -3895,15 +3807,10 @@ public Builder setInsert(com.google.spanner.v1.Mutation.Write.Builder builderFor
      *
      * .google.spanner.v1.Mutation.Write insert = 1;
      */
-    public Builder mergeInsert(com.google.spanner.v1.Mutation.Write value) {
+    public Builder mergeInsert(Write value) {
       if (insertBuilder_ == null) {
-        if (operationCase_ == 1
-            && operation_ != com.google.spanner.v1.Mutation.Write.getDefaultInstance()) {
-          operation_ =
-              com.google.spanner.v1.Mutation.Write.newBuilder(
-                      (com.google.spanner.v1.Mutation.Write) operation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (operationCase_ == 1 && operation_ != Write.getDefaultInstance()) {
+          operation_ = Write.newBuilder((Write) operation_).mergeFrom(value).buildPartial();
         } else {
           operation_ = value;
         }
@@ -3953,7 +3860,7 @@ public Builder clearInsert() {
      *
      * .google.spanner.v1.Mutation.Write insert = 1;
      */
-    public com.google.spanner.v1.Mutation.Write.Builder getInsertBuilder() {
+    public Write.Builder getInsertBuilder() {
       return getInsertFieldBuilder().getBuilder();
     }
     /**
@@ -3966,15 +3873,15 @@ public com.google.spanner.v1.Mutation.Write.Builder getInsertBuilder() {
      *
      * .google.spanner.v1.Mutation.Write insert = 1;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrBuilder() {
+    @Override
+    public WriteOrBuilder getInsertOrBuilder() {
       if ((operationCase_ == 1) && (insertBuilder_ != null)) {
         return insertBuilder_.getMessageOrBuilder();
       } else {
         if (operationCase_ == 1) {
-          return (com.google.spanner.v1.Mutation.Write) operation_;
+          return (Write) operation_;
         }
-        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+        return Write.getDefaultInstance();
       }
     }
     /**
@@ -3987,23 +3894,15 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrBuilder() {
      *
      * .google.spanner.v1.Mutation.Write insert = 1;
      */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Mutation.Write,
-            com.google.spanner.v1.Mutation.Write.Builder,
-            com.google.spanner.v1.Mutation.WriteOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         getInsertFieldBuilder() {
       if (insertBuilder_ == null) {
         if (!(operationCase_ == 1)) {
-          operation_ = com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+          operation_ = Write.getDefaultInstance();
         }
         insertBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.Mutation.Write,
-                com.google.spanner.v1.Mutation.Write.Builder,
-                com.google.spanner.v1.Mutation.WriteOrBuilder>(
-                (com.google.spanner.v1.Mutation.Write) operation_,
-                getParentForChildren(),
-                isClean());
+            new com.google.protobuf.SingleFieldBuilderV3(
+                (Write) operation_, getParentForChildren(), isClean());
         operation_ = null;
       }
       operationCase_ = 1;
@@ -4012,10 +3911,7 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrBuilder() {
       return insertBuilder_;
     }
 
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Mutation.Write,
-            com.google.spanner.v1.Mutation.Write.Builder,
-            com.google.spanner.v1.Mutation.WriteOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         updateBuilder_;
     /**
      *
@@ -4029,7 +3925,7 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrBuilder() {
      *
      * @return Whether the update field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasUpdate() {
       return operationCase_ == 2;
     }
@@ -4045,18 +3941,18 @@ public boolean hasUpdate() {
      *
      * @return The update.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation.Write getUpdate() {
+    @Override
+    public Write getUpdate() {
       if (updateBuilder_ == null) {
         if (operationCase_ == 2) {
-          return (com.google.spanner.v1.Mutation.Write) operation_;
+          return (Write) operation_;
         }
-        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+        return Write.getDefaultInstance();
       } else {
         if (operationCase_ == 2) {
           return updateBuilder_.getMessage();
         }
-        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+        return Write.getDefaultInstance();
       }
     }
     /**
@@ -4069,7 +3965,7 @@ public com.google.spanner.v1.Mutation.Write getUpdate() {
      *
      * .google.spanner.v1.Mutation.Write update = 2;
      */
-    public Builder setUpdate(com.google.spanner.v1.Mutation.Write value) {
+    public Builder setUpdate(Write value) {
       if (updateBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -4092,7 +3988,7 @@ public Builder setUpdate(com.google.spanner.v1.Mutation.Write value) {
      *
      * .google.spanner.v1.Mutation.Write update = 2;
      */
-    public Builder setUpdate(com.google.spanner.v1.Mutation.Write.Builder builderForValue) {
+    public Builder setUpdate(Write.Builder builderForValue) {
       if (updateBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -4112,15 +4008,10 @@ public Builder setUpdate(com.google.spanner.v1.Mutation.Write.Builder builderFor
      *
      * .google.spanner.v1.Mutation.Write update = 2;
      */
-    public Builder mergeUpdate(com.google.spanner.v1.Mutation.Write value) {
+    public Builder mergeUpdate(Write value) {
       if (updateBuilder_ == null) {
-        if (operationCase_ == 2
-            && operation_ != com.google.spanner.v1.Mutation.Write.getDefaultInstance()) {
-          operation_ =
-              com.google.spanner.v1.Mutation.Write.newBuilder(
-                      (com.google.spanner.v1.Mutation.Write) operation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (operationCase_ == 2 && operation_ != Write.getDefaultInstance()) {
+          operation_ = Write.newBuilder((Write) operation_).mergeFrom(value).buildPartial();
         } else {
           operation_ = value;
         }
@@ -4170,7 +4061,7 @@ public Builder clearUpdate() {
      *
      * .google.spanner.v1.Mutation.Write update = 2;
      */
-    public com.google.spanner.v1.Mutation.Write.Builder getUpdateBuilder() {
+    public Write.Builder getUpdateBuilder() {
       return getUpdateFieldBuilder().getBuilder();
     }
     /**
@@ -4183,15 +4074,15 @@ public com.google.spanner.v1.Mutation.Write.Builder getUpdateBuilder() {
      *
      * .google.spanner.v1.Mutation.Write update = 2;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation.WriteOrBuilder getUpdateOrBuilder() {
+    @Override
+    public WriteOrBuilder getUpdateOrBuilder() {
       if ((operationCase_ == 2) && (updateBuilder_ != null)) {
         return updateBuilder_.getMessageOrBuilder();
       } else {
         if (operationCase_ == 2) {
-          return (com.google.spanner.v1.Mutation.Write) operation_;
+          return (Write) operation_;
         }
-        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+        return Write.getDefaultInstance();
       }
     }
     /**
@@ -4204,23 +4095,15 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getUpdateOrBuilder() {
      *
      * .google.spanner.v1.Mutation.Write update = 2;
      */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Mutation.Write,
-            com.google.spanner.v1.Mutation.Write.Builder,
-            com.google.spanner.v1.Mutation.WriteOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         getUpdateFieldBuilder() {
       if (updateBuilder_ == null) {
         if (!(operationCase_ == 2)) {
-          operation_ = com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+          operation_ = Write.getDefaultInstance();
         }
         updateBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.Mutation.Write,
-                com.google.spanner.v1.Mutation.Write.Builder,
-                com.google.spanner.v1.Mutation.WriteOrBuilder>(
-                (com.google.spanner.v1.Mutation.Write) operation_,
-                getParentForChildren(),
-                isClean());
+            new com.google.protobuf.SingleFieldBuilderV3(
+                (Write) operation_, getParentForChildren(), isClean());
         operation_ = null;
       }
       operationCase_ = 2;
@@ -4229,10 +4112,7 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getUpdateOrBuilder() {
       return updateBuilder_;
     }
 
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Mutation.Write,
-            com.google.spanner.v1.Mutation.Write.Builder,
-            com.google.spanner.v1.Mutation.WriteOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         insertOrUpdateBuilder_;
     /**
      *
@@ -4250,7 +4130,7 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getUpdateOrBuilder() {
      *
      * @return Whether the insertOrUpdate field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasInsertOrUpdate() {
       return operationCase_ == 3;
     }
@@ -4270,18 +4150,18 @@ public boolean hasInsertOrUpdate() {
      *
      * @return The insertOrUpdate.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation.Write getInsertOrUpdate() {
+    @Override
+    public Write getInsertOrUpdate() {
       if (insertOrUpdateBuilder_ == null) {
         if (operationCase_ == 3) {
-          return (com.google.spanner.v1.Mutation.Write) operation_;
+          return (Write) operation_;
         }
-        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+        return Write.getDefaultInstance();
       } else {
         if (operationCase_ == 3) {
           return insertOrUpdateBuilder_.getMessage();
         }
-        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+        return Write.getDefaultInstance();
       }
     }
     /**
@@ -4298,7 +4178,7 @@ public com.google.spanner.v1.Mutation.Write getInsertOrUpdate() {
      *
      * .google.spanner.v1.Mutation.Write insert_or_update = 3;
      */
-    public Builder setInsertOrUpdate(com.google.spanner.v1.Mutation.Write value) {
+    public Builder setInsertOrUpdate(Write value) {
       if (insertOrUpdateBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -4325,7 +4205,7 @@ public Builder setInsertOrUpdate(com.google.spanner.v1.Mutation.Write value) {
      *
      * .google.spanner.v1.Mutation.Write insert_or_update = 3;
      */
-    public Builder setInsertOrUpdate(com.google.spanner.v1.Mutation.Write.Builder builderForValue) {
+    public Builder setInsertOrUpdate(Write.Builder builderForValue) {
       if (insertOrUpdateBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -4349,15 +4229,10 @@ public Builder setInsertOrUpdate(com.google.spanner.v1.Mutation.Write.Builder bu
      *
      * .google.spanner.v1.Mutation.Write insert_or_update = 3;
      */
-    public Builder mergeInsertOrUpdate(com.google.spanner.v1.Mutation.Write value) {
+    public Builder mergeInsertOrUpdate(Write value) {
       if (insertOrUpdateBuilder_ == null) {
-        if (operationCase_ == 3
-            && operation_ != com.google.spanner.v1.Mutation.Write.getDefaultInstance()) {
-          operation_ =
-              com.google.spanner.v1.Mutation.Write.newBuilder(
-                      (com.google.spanner.v1.Mutation.Write) operation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (operationCase_ == 3 && operation_ != Write.getDefaultInstance()) {
+          operation_ = Write.newBuilder((Write) operation_).mergeFrom(value).buildPartial();
         } else {
           operation_ = value;
         }
@@ -4415,7 +4290,7 @@ public Builder clearInsertOrUpdate() {
      *
      * .google.spanner.v1.Mutation.Write insert_or_update = 3;
      */
-    public com.google.spanner.v1.Mutation.Write.Builder getInsertOrUpdateBuilder() {
+    public Write.Builder getInsertOrUpdateBuilder() {
       return getInsertOrUpdateFieldBuilder().getBuilder();
     }
     /**
@@ -4432,15 +4307,15 @@ public com.google.spanner.v1.Mutation.Write.Builder getInsertOrUpdateBuilder() {
      *
      * .google.spanner.v1.Mutation.Write insert_or_update = 3;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrUpdateOrBuilder() {
+    @Override
+    public WriteOrBuilder getInsertOrUpdateOrBuilder() {
       if ((operationCase_ == 3) && (insertOrUpdateBuilder_ != null)) {
         return insertOrUpdateBuilder_.getMessageOrBuilder();
       } else {
         if (operationCase_ == 3) {
-          return (com.google.spanner.v1.Mutation.Write) operation_;
+          return (Write) operation_;
         }
-        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+        return Write.getDefaultInstance();
       }
     }
     /**
@@ -4457,23 +4332,15 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrUpdateOrBuilder(
      *
      * .google.spanner.v1.Mutation.Write insert_or_update = 3;
      */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Mutation.Write,
-            com.google.spanner.v1.Mutation.Write.Builder,
-            com.google.spanner.v1.Mutation.WriteOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         getInsertOrUpdateFieldBuilder() {
       if (insertOrUpdateBuilder_ == null) {
         if (!(operationCase_ == 3)) {
-          operation_ = com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+          operation_ = Write.getDefaultInstance();
         }
         insertOrUpdateBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.Mutation.Write,
-                com.google.spanner.v1.Mutation.Write.Builder,
-                com.google.spanner.v1.Mutation.WriteOrBuilder>(
-                (com.google.spanner.v1.Mutation.Write) operation_,
-                getParentForChildren(),
-                isClean());
+            new com.google.protobuf.SingleFieldBuilderV3(
+                (Write) operation_, getParentForChildren(), isClean());
         operation_ = null;
       }
       operationCase_ = 3;
@@ -4482,10 +4349,7 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrUpdateOrBuilder(
       return insertOrUpdateBuilder_;
     }
 
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Mutation.Write,
-            com.google.spanner.v1.Mutation.Write.Builder,
-            com.google.spanner.v1.Mutation.WriteOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         replaceBuilder_;
     /**
      *
@@ -4505,7 +4369,7 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrUpdateOrBuilder(
      *
      * @return Whether the replace field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasReplace() {
       return operationCase_ == 4;
     }
@@ -4527,18 +4391,18 @@ public boolean hasReplace() {
      *
      * @return The replace.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation.Write getReplace() {
+    @Override
+    public Write getReplace() {
       if (replaceBuilder_ == null) {
         if (operationCase_ == 4) {
-          return (com.google.spanner.v1.Mutation.Write) operation_;
+          return (Write) operation_;
         }
-        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+        return Write.getDefaultInstance();
       } else {
         if (operationCase_ == 4) {
           return replaceBuilder_.getMessage();
         }
-        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+        return Write.getDefaultInstance();
       }
     }
     /**
@@ -4557,7 +4421,7 @@ public com.google.spanner.v1.Mutation.Write getReplace() {
      *
      * .google.spanner.v1.Mutation.Write replace = 4;
      */
-    public Builder setReplace(com.google.spanner.v1.Mutation.Write value) {
+    public Builder setReplace(Write value) {
       if (replaceBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -4586,7 +4450,7 @@ public Builder setReplace(com.google.spanner.v1.Mutation.Write value) {
      *
      * .google.spanner.v1.Mutation.Write replace = 4;
      */
-    public Builder setReplace(com.google.spanner.v1.Mutation.Write.Builder builderForValue) {
+    public Builder setReplace(Write.Builder builderForValue) {
       if (replaceBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -4612,15 +4476,10 @@ public Builder setReplace(com.google.spanner.v1.Mutation.Write.Builder builderFo
      *
      * .google.spanner.v1.Mutation.Write replace = 4;
      */
-    public Builder mergeReplace(com.google.spanner.v1.Mutation.Write value) {
+    public Builder mergeReplace(Write value) {
       if (replaceBuilder_ == null) {
-        if (operationCase_ == 4
-            && operation_ != com.google.spanner.v1.Mutation.Write.getDefaultInstance()) {
-          operation_ =
-              com.google.spanner.v1.Mutation.Write.newBuilder(
-                      (com.google.spanner.v1.Mutation.Write) operation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (operationCase_ == 4 && operation_ != Write.getDefaultInstance()) {
+          operation_ = Write.newBuilder((Write) operation_).mergeFrom(value).buildPartial();
         } else {
           operation_ = value;
         }
@@ -4682,7 +4541,7 @@ public Builder clearReplace() {
      *
      * .google.spanner.v1.Mutation.Write replace = 4;
      */
-    public com.google.spanner.v1.Mutation.Write.Builder getReplaceBuilder() {
+    public Write.Builder getReplaceBuilder() {
       return getReplaceFieldBuilder().getBuilder();
     }
     /**
@@ -4701,15 +4560,15 @@ public com.google.spanner.v1.Mutation.Write.Builder getReplaceBuilder() {
      *
      * .google.spanner.v1.Mutation.Write replace = 4;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation.WriteOrBuilder getReplaceOrBuilder() {
+    @Override
+    public WriteOrBuilder getReplaceOrBuilder() {
       if ((operationCase_ == 4) && (replaceBuilder_ != null)) {
         return replaceBuilder_.getMessageOrBuilder();
       } else {
         if (operationCase_ == 4) {
-          return (com.google.spanner.v1.Mutation.Write) operation_;
+          return (Write) operation_;
         }
-        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+        return Write.getDefaultInstance();
       }
     }
     /**
@@ -4728,23 +4587,15 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getReplaceOrBuilder() {
      *
      * .google.spanner.v1.Mutation.Write replace = 4;
      */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Mutation.Write,
-            com.google.spanner.v1.Mutation.Write.Builder,
-            com.google.spanner.v1.Mutation.WriteOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         getReplaceFieldBuilder() {
       if (replaceBuilder_ == null) {
         if (!(operationCase_ == 4)) {
-          operation_ = com.google.spanner.v1.Mutation.Write.getDefaultInstance();
+          operation_ = Write.getDefaultInstance();
         }
         replaceBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.Mutation.Write,
-                com.google.spanner.v1.Mutation.Write.Builder,
-                com.google.spanner.v1.Mutation.WriteOrBuilder>(
-                (com.google.spanner.v1.Mutation.Write) operation_,
-                getParentForChildren(),
-                isClean());
+            new com.google.protobuf.SingleFieldBuilderV3(
+                (Write) operation_, getParentForChildren(), isClean());
         operation_ = null;
       }
       operationCase_ = 4;
@@ -4753,10 +4604,7 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getReplaceOrBuilder() {
       return replaceBuilder_;
     }
 
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Mutation.Delete,
-            com.google.spanner.v1.Mutation.Delete.Builder,
-            com.google.spanner.v1.Mutation.DeleteOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         deleteBuilder_;
     /**
      *
@@ -4770,7 +4618,7 @@ public com.google.spanner.v1.Mutation.WriteOrBuilder getReplaceOrBuilder() {
      *
      * @return Whether the delete field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasDelete() {
       return operationCase_ == 5;
     }
@@ -4786,18 +4634,18 @@ public boolean hasDelete() {
      *
      * @return The delete.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation.Delete getDelete() {
+    @Override
+    public Delete getDelete() {
       if (deleteBuilder_ == null) {
         if (operationCase_ == 5) {
-          return (com.google.spanner.v1.Mutation.Delete) operation_;
+          return (Delete) operation_;
         }
-        return com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
+        return Delete.getDefaultInstance();
       } else {
         if (operationCase_ == 5) {
           return deleteBuilder_.getMessage();
         }
-        return com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
+        return Delete.getDefaultInstance();
       }
     }
     /**
@@ -4810,7 +4658,7 @@ public com.google.spanner.v1.Mutation.Delete getDelete() {
      *
      * .google.spanner.v1.Mutation.Delete delete = 5;
      */
-    public Builder setDelete(com.google.spanner.v1.Mutation.Delete value) {
+    public Builder setDelete(Delete value) {
       if (deleteBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -4833,7 +4681,7 @@ public Builder setDelete(com.google.spanner.v1.Mutation.Delete value) {
      *
      * .google.spanner.v1.Mutation.Delete delete = 5;
      */
-    public Builder setDelete(com.google.spanner.v1.Mutation.Delete.Builder builderForValue) {
+    public Builder setDelete(Delete.Builder builderForValue) {
       if (deleteBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -4853,15 +4701,10 @@ public Builder setDelete(com.google.spanner.v1.Mutation.Delete.Builder builderFo
      *
      * .google.spanner.v1.Mutation.Delete delete = 5;
      */
-    public Builder mergeDelete(com.google.spanner.v1.Mutation.Delete value) {
+    public Builder mergeDelete(Delete value) {
       if (deleteBuilder_ == null) {
-        if (operationCase_ == 5
-            && operation_ != com.google.spanner.v1.Mutation.Delete.getDefaultInstance()) {
-          operation_ =
-              com.google.spanner.v1.Mutation.Delete.newBuilder(
-                      (com.google.spanner.v1.Mutation.Delete) operation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (operationCase_ == 5 && operation_ != Delete.getDefaultInstance()) {
+          operation_ = Delete.newBuilder((Delete) operation_).mergeFrom(value).buildPartial();
         } else {
           operation_ = value;
         }
@@ -4911,7 +4754,7 @@ public Builder clearDelete() {
      *
      * .google.spanner.v1.Mutation.Delete delete = 5;
      */
-    public com.google.spanner.v1.Mutation.Delete.Builder getDeleteBuilder() {
+    public Delete.Builder getDeleteBuilder() {
       return getDeleteFieldBuilder().getBuilder();
     }
     /**
@@ -4924,15 +4767,15 @@ public com.google.spanner.v1.Mutation.Delete.Builder getDeleteBuilder() {
      *
      * .google.spanner.v1.Mutation.Delete delete = 5;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.Mutation.DeleteOrBuilder getDeleteOrBuilder() {
+    @Override
+    public DeleteOrBuilder getDeleteOrBuilder() {
       if ((operationCase_ == 5) && (deleteBuilder_ != null)) {
         return deleteBuilder_.getMessageOrBuilder();
       } else {
         if (operationCase_ == 5) {
-          return (com.google.spanner.v1.Mutation.Delete) operation_;
+          return (Delete) operation_;
         }
-        return com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
+        return Delete.getDefaultInstance();
       }
     }
     /**
@@ -4945,23 +4788,15 @@ public com.google.spanner.v1.Mutation.DeleteOrBuilder getDeleteOrBuilder() {
      *
      * .google.spanner.v1.Mutation.Delete delete = 5;
      */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Mutation.Delete,
-            com.google.spanner.v1.Mutation.Delete.Builder,
-            com.google.spanner.v1.Mutation.DeleteOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         getDeleteFieldBuilder() {
       if (deleteBuilder_ == null) {
         if (!(operationCase_ == 5)) {
-          operation_ = com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
+          operation_ = Delete.getDefaultInstance();
         }
         deleteBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.Mutation.Delete,
-                com.google.spanner.v1.Mutation.Delete.Builder,
-                com.google.spanner.v1.Mutation.DeleteOrBuilder>(
-                (com.google.spanner.v1.Mutation.Delete) operation_,
-                getParentForChildren(),
-                isClean());
+            new com.google.protobuf.SingleFieldBuilderV3(
+                (Delete) operation_, getParentForChildren(), isClean());
         operation_ = null;
       }
       operationCase_ = 5;
@@ -4970,12 +4805,12 @@ public com.google.spanner.v1.Mutation.DeleteOrBuilder getDeleteOrBuilder() {
       return deleteBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4985,19 +4820,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.Mutation)
-  private static final com.google.spanner.v1.Mutation DEFAULT_INSTANCE;
+  private static final Mutation DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.Mutation();
+    DEFAULT_INSTANCE = new Mutation();
   }
 
-  public static com.google.spanner.v1.Mutation getDefaultInstance() {
+  public static Mutation getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public Mutation parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5010,13 +4845,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.Mutation getDefaultInstanceForType() {
+  @Override
+  public Mutation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationOrBuilder.java
index c91b2bbb83..609efbf18d 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationOrBuilder.java
@@ -48,7 +48,7 @@ public interface MutationOrBuilder
    *
    * @return The insert.
    */
-  com.google.spanner.v1.Mutation.Write getInsert();
+  Mutation.Write getInsert();
   /**
    *
    *
@@ -59,7 +59,7 @@ public interface MutationOrBuilder
    *
    * .google.spanner.v1.Mutation.Write insert = 1;
    */
-  com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrBuilder();
+  Mutation.WriteOrBuilder getInsertOrBuilder();
 
   /**
    *
@@ -86,7 +86,7 @@ public interface MutationOrBuilder
    *
    * @return The update.
    */
-  com.google.spanner.v1.Mutation.Write getUpdate();
+  Mutation.Write getUpdate();
   /**
    *
    *
@@ -97,7 +97,7 @@ public interface MutationOrBuilder
    *
    * .google.spanner.v1.Mutation.Write update = 2;
    */
-  com.google.spanner.v1.Mutation.WriteOrBuilder getUpdateOrBuilder();
+  Mutation.WriteOrBuilder getUpdateOrBuilder();
 
   /**
    *
@@ -132,7 +132,7 @@ public interface MutationOrBuilder
    *
    * @return The insertOrUpdate.
    */
-  com.google.spanner.v1.Mutation.Write getInsertOrUpdate();
+  Mutation.Write getInsertOrUpdate();
   /**
    *
    *
@@ -147,7 +147,7 @@ public interface MutationOrBuilder
    *
    * .google.spanner.v1.Mutation.Write insert_or_update = 3;
    */
-  com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrUpdateOrBuilder();
+  Mutation.WriteOrBuilder getInsertOrUpdateOrBuilder();
 
   /**
    *
@@ -186,7 +186,7 @@ public interface MutationOrBuilder
    *
    * @return The replace.
    */
-  com.google.spanner.v1.Mutation.Write getReplace();
+  Mutation.Write getReplace();
   /**
    *
    *
@@ -203,7 +203,7 @@ public interface MutationOrBuilder
    *
    * .google.spanner.v1.Mutation.Write replace = 4;
    */
-  com.google.spanner.v1.Mutation.WriteOrBuilder getReplaceOrBuilder();
+  Mutation.WriteOrBuilder getReplaceOrBuilder();
 
   /**
    *
@@ -230,7 +230,7 @@ public interface MutationOrBuilder
    *
    * @return The delete.
    */
-  com.google.spanner.v1.Mutation.Delete getDelete();
+  Mutation.Delete getDelete();
   /**
    *
    *
@@ -241,7 +241,7 @@ public interface MutationOrBuilder
    *
    * .google.spanner.v1.Mutation.Delete delete = 5;
    */
-  com.google.spanner.v1.Mutation.DeleteOrBuilder getDeleteOrBuilder();
+  Mutation.DeleteOrBuilder getDeleteOrBuilder();
 
-  public com.google.spanner.v1.Mutation.OperationCase getOperationCase();
+  public Mutation.OperationCase getOperationCase();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java
index 27ce2b4f3a..0e1f5ab4d8 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java
@@ -47,7 +47,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
   static {
-    java.lang.String[] descriptorData = {
+    String[] descriptorData = {
       "\n google/spanner/v1/mutation.proto\022\021goog"
           + "le.spanner.v1\032\034google/protobuf/struct.pr"
           + "oto\032\034google/spanner/v1/keys.proto\032\034googl"
@@ -74,7 +74,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.protobuf.StructProto.getDescriptor(),
-              com.google.spanner.v1.KeysProto.getDescriptor(),
+              KeysProto.getDescriptor(),
               com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_spanner_v1_Mutation_descriptor =
@@ -82,7 +82,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_Mutation_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_Mutation_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Insert", "Update", "InsertOrUpdate", "Replace", "Delete", "Operation",
             });
     internal_static_google_spanner_v1_Mutation_Write_descriptor =
@@ -90,7 +90,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_Mutation_Write_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_Mutation_Write_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Table", "Columns", "Values",
             });
     internal_static_google_spanner_v1_Mutation_Delete_descriptor =
@@ -98,11 +98,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_Mutation_Delete_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_Mutation_Delete_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Table", "KeySet",
             });
     com.google.protobuf.StructProto.getDescriptor();
-    com.google.spanner.v1.KeysProto.getDescriptor();
+    KeysProto.getDescriptor();
     com.google.api.AnnotationsProto.getDescriptor();
   }
 
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java
index 4caabb2902..cf4504a92f 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java
@@ -44,13 +44,13 @@ private PartialResultSet() {
     resumeToken_ = com.google.protobuf.ByteString.EMPTY;
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new PartialResultSet();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -61,7 +61,7 @@ private PartialResultSet(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -76,13 +76,11 @@ private PartialResultSet(
             break;
           case 10:
             {
-              com.google.spanner.v1.ResultSetMetadata.Builder subBuilder = null;
+              ResultSetMetadata.Builder subBuilder = null;
               if (metadata_ != null) {
                 subBuilder = metadata_.toBuilder();
               }
-              metadata_ =
-                  input.readMessage(
-                      com.google.spanner.v1.ResultSetMetadata.parser(), extensionRegistry);
+              metadata_ = input.readMessage(ResultSetMetadata.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(metadata_);
                 metadata_ = subBuilder.buildPartial();
@@ -111,13 +109,11 @@ private PartialResultSet(
             }
           case 42:
             {
-              com.google.spanner.v1.ResultSetStats.Builder subBuilder = null;
+              ResultSetStats.Builder subBuilder = null;
               if (stats_ != null) {
                 subBuilder = stats_.toBuilder();
               }
-              stats_ =
-                  input.readMessage(
-                      com.google.spanner.v1.ResultSetStats.parser(), extensionRegistry);
+              stats_ = input.readMessage(ResultSetStats.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(stats_);
                 stats_ = subBuilder.buildPartial();
@@ -148,22 +144,17 @@ private PartialResultSet(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.ResultSetProto
-        .internal_static_google_spanner_v1_PartialResultSet_descriptor;
+    return ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.ResultSetProto
-        .internal_static_google_spanner_v1_PartialResultSet_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.PartialResultSet.class,
-            com.google.spanner.v1.PartialResultSet.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(PartialResultSet.class, Builder.class);
   }
 
   public static final int METADATA_FIELD_NUMBER = 1;
-  private com.google.spanner.v1.ResultSetMetadata metadata_;
+  private ResultSetMetadata metadata_;
   /**
    *
    *
@@ -176,7 +167,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the metadata field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasMetadata() {
     return metadata_ != null;
   }
@@ -192,11 +183,9 @@ public boolean hasMetadata() {
    *
    * @return The metadata.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.ResultSetMetadata getMetadata() {
-    return metadata_ == null
-        ? com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()
-        : metadata_;
+  @Override
+  public ResultSetMetadata getMetadata() {
+    return metadata_ == null ? ResultSetMetadata.getDefaultInstance() : metadata_;
   }
   /**
    *
@@ -208,8 +197,8 @@ public com.google.spanner.v1.ResultSetMetadata getMetadata() {
    *
    * .google.spanner.v1.ResultSetMetadata metadata = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() {
+  @Override
+  public ResultSetMetadataOrBuilder getMetadataOrBuilder() {
     return getMetadata();
   }
 
@@ -282,7 +271,7 @@ public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() {
    *
    * repeated .google.protobuf.Value values = 2;
    */
-  @java.lang.Override
+  @Override
   public java.util.List getValuesList() {
     return values_;
   }
@@ -353,7 +342,7 @@ public java.util.List getValuesList() {
    *
    * repeated .google.protobuf.Value values = 2;
    */
-  @java.lang.Override
+  @Override
   public java.util.List getValuesOrBuilderList() {
     return values_;
   }
@@ -424,7 +413,7 @@ public java.util.List getValuesOrB
    *
    * repeated .google.protobuf.Value values = 2;
    */
-  @java.lang.Override
+  @Override
   public int getValuesCount() {
     return values_.size();
   }
@@ -495,7 +484,7 @@ public int getValuesCount() {
    *
    * repeated .google.protobuf.Value values = 2;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Value getValues(int index) {
     return values_.get(index);
   }
@@ -566,7 +555,7 @@ public com.google.protobuf.Value getValues(int index) {
    *
    * repeated .google.protobuf.Value values = 2;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ValueOrBuilder getValuesOrBuilder(int index) {
     return values_.get(index);
   }
@@ -586,7 +575,7 @@ public com.google.protobuf.ValueOrBuilder getValuesOrBuilder(int index) {
    *
    * @return The chunkedValue.
    */
-  @java.lang.Override
+  @Override
   public boolean getChunkedValue() {
     return chunkedValue_;
   }
@@ -608,13 +597,13 @@ public boolean getChunkedValue() {
    *
    * @return The resumeToken.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ByteString getResumeToken() {
     return resumeToken_;
   }
 
   public static final int STATS_FIELD_NUMBER = 5;
-  private com.google.spanner.v1.ResultSetStats stats_;
+  private ResultSetStats stats_;
   /**
    *
    *
@@ -631,7 +620,7 @@ public com.google.protobuf.ByteString getResumeToken() {
    *
    * @return Whether the stats field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasStats() {
     return stats_ != null;
   }
@@ -651,9 +640,9 @@ public boolean hasStats() {
    *
    * @return The stats.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.ResultSetStats getStats() {
-    return stats_ == null ? com.google.spanner.v1.ResultSetStats.getDefaultInstance() : stats_;
+  @Override
+  public ResultSetStats getStats() {
+    return stats_ == null ? ResultSetStats.getDefaultInstance() : stats_;
   }
   /**
    *
@@ -669,14 +658,14 @@ public com.google.spanner.v1.ResultSetStats getStats() {
    *
    * .google.spanner.v1.ResultSetStats stats = 5;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
+  @Override
+  public ResultSetStatsOrBuilder getStatsOrBuilder() {
     return getStats();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -686,7 +675,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (metadata_ != null) {
       output.writeMessage(1, getMetadata());
@@ -706,7 +695,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -732,15 +721,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.PartialResultSet)) {
+    if (!(obj instanceof PartialResultSet)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.PartialResultSet other = (com.google.spanner.v1.PartialResultSet) obj;
+    PartialResultSet other = (PartialResultSet) obj;
 
     if (hasMetadata() != other.hasMetadata()) return false;
     if (hasMetadata()) {
@@ -757,7 +746,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -785,71 +774,69 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.PartialResultSet parseFrom(java.nio.ByteBuffer data)
+  public static PartialResultSet parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartialResultSet parseFrom(
+  public static PartialResultSet parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.PartialResultSet parseFrom(
-      com.google.protobuf.ByteString data)
+  public static PartialResultSet parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartialResultSet parseFrom(
+  public static PartialResultSet 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.spanner.v1.PartialResultSet parseFrom(byte[] data)
+  public static PartialResultSet parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartialResultSet parseFrom(
+  public static PartialResultSet parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.PartialResultSet parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static PartialResultSet parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartialResultSet parseFrom(
+  public static PartialResultSet 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.spanner.v1.PartialResultSet parseDelimitedFrom(java.io.InputStream input)
+  public static PartialResultSet parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartialResultSet parseDelimitedFrom(
+  public static PartialResultSet 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.spanner.v1.PartialResultSet parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static PartialResultSet parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartialResultSet parseFrom(
+  public static PartialResultSet parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -857,7 +844,7 @@ public static com.google.spanner.v1.PartialResultSet parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -866,17 +853,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.PartialResultSet prototype) {
+  public static Builder newBuilder(PartialResultSet prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -894,20 +881,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.PartialResultSet)
-      com.google.spanner.v1.PartialResultSetOrBuilder {
+      PartialResultSetOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.ResultSetProto
-          .internal_static_google_spanner_v1_PartialResultSet_descriptor;
+      return ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.ResultSetProto
-          .internal_static_google_spanner_v1_PartialResultSet_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.PartialResultSet.class,
-              com.google.spanner.v1.PartialResultSet.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(PartialResultSet.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.PartialResultSet.newBuilder()
@@ -915,7 +897,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -926,7 +908,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       if (metadataBuilder_ == null) {
@@ -954,30 +936,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.ResultSetProto
-          .internal_static_google_spanner_v1_PartialResultSet_descriptor;
+      return ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartialResultSet getDefaultInstanceForType() {
-      return com.google.spanner.v1.PartialResultSet.getDefaultInstance();
+    @Override
+    public PartialResultSet getDefaultInstanceForType() {
+      return PartialResultSet.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartialResultSet build() {
-      com.google.spanner.v1.PartialResultSet result = buildPartial();
+    @Override
+    public PartialResultSet build() {
+      PartialResultSet result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartialResultSet buildPartial() {
-      com.google.spanner.v1.PartialResultSet result =
-          new com.google.spanner.v1.PartialResultSet(this);
+    @Override
+    public PartialResultSet buildPartial() {
+      PartialResultSet result = new PartialResultSet(this);
       int from_bitField0_ = bitField0_;
       if (metadataBuilder_ == null) {
         result.metadata_ = metadata_;
@@ -1004,51 +984,50 @@ public com.google.spanner.v1.PartialResultSet buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.PartialResultSet) {
-        return mergeFrom((com.google.spanner.v1.PartialResultSet) other);
+      if (other instanceof PartialResultSet) {
+        return mergeFrom((PartialResultSet) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.PartialResultSet other) {
-      if (other == com.google.spanner.v1.PartialResultSet.getDefaultInstance()) return this;
+    public Builder mergeFrom(PartialResultSet other) {
+      if (other == PartialResultSet.getDefaultInstance()) return this;
       if (other.hasMetadata()) {
         mergeMetadata(other.getMetadata());
       }
@@ -1093,21 +1072,21 @@ public Builder mergeFrom(com.google.spanner.v1.PartialResultSet other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.PartialResultSet parsedMessage = null;
+      PartialResultSet parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.PartialResultSet) e.getUnfinishedMessage();
+        parsedMessage = (PartialResultSet) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -1119,11 +1098,9 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.spanner.v1.ResultSetMetadata metadata_;
+    private ResultSetMetadata metadata_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.ResultSetMetadata,
-            com.google.spanner.v1.ResultSetMetadata.Builder,
-            com.google.spanner.v1.ResultSetMetadataOrBuilder>
+            ResultSetMetadata, ResultSetMetadata.Builder, ResultSetMetadataOrBuilder>
         metadataBuilder_;
     /**
      *
@@ -1152,11 +1129,9 @@ public boolean hasMetadata() {
      *
      * @return The metadata.
      */
-    public com.google.spanner.v1.ResultSetMetadata getMetadata() {
+    public ResultSetMetadata getMetadata() {
       if (metadataBuilder_ == null) {
-        return metadata_ == null
-            ? com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()
-            : metadata_;
+        return metadata_ == null ? ResultSetMetadata.getDefaultInstance() : metadata_;
       } else {
         return metadataBuilder_.getMessage();
       }
@@ -1171,7 +1146,7 @@ public com.google.spanner.v1.ResultSetMetadata getMetadata() {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public Builder setMetadata(com.google.spanner.v1.ResultSetMetadata value) {
+    public Builder setMetadata(ResultSetMetadata value) {
       if (metadataBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1194,7 +1169,7 @@ public Builder setMetadata(com.google.spanner.v1.ResultSetMetadata value) {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public Builder setMetadata(com.google.spanner.v1.ResultSetMetadata.Builder builderForValue) {
+    public Builder setMetadata(ResultSetMetadata.Builder builderForValue) {
       if (metadataBuilder_ == null) {
         metadata_ = builderForValue.build();
         onChanged();
@@ -1214,13 +1189,10 @@ public Builder setMetadata(com.google.spanner.v1.ResultSetMetadata.Builder build
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public Builder mergeMetadata(com.google.spanner.v1.ResultSetMetadata value) {
+    public Builder mergeMetadata(ResultSetMetadata value) {
       if (metadataBuilder_ == null) {
         if (metadata_ != null) {
-          metadata_ =
-              com.google.spanner.v1.ResultSetMetadata.newBuilder(metadata_)
-                  .mergeFrom(value)
-                  .buildPartial();
+          metadata_ = ResultSetMetadata.newBuilder(metadata_).mergeFrom(value).buildPartial();
         } else {
           metadata_ = value;
         }
@@ -1262,7 +1234,7 @@ public Builder clearMetadata() {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public com.google.spanner.v1.ResultSetMetadata.Builder getMetadataBuilder() {
+    public ResultSetMetadata.Builder getMetadataBuilder() {
 
       onChanged();
       return getMetadataFieldBuilder().getBuilder();
@@ -1277,13 +1249,11 @@ public com.google.spanner.v1.ResultSetMetadata.Builder getMetadataBuilder() {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() {
+    public ResultSetMetadataOrBuilder getMetadataOrBuilder() {
       if (metadataBuilder_ != null) {
         return metadataBuilder_.getMessageOrBuilder();
       } else {
-        return metadata_ == null
-            ? com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()
-            : metadata_;
+        return metadata_ == null ? ResultSetMetadata.getDefaultInstance() : metadata_;
       }
     }
     /**
@@ -1297,16 +1267,12 @@ public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() {
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.ResultSetMetadata,
-            com.google.spanner.v1.ResultSetMetadata.Builder,
-            com.google.spanner.v1.ResultSetMetadataOrBuilder>
+            ResultSetMetadata, ResultSetMetadata.Builder, ResultSetMetadataOrBuilder>
         getMetadataFieldBuilder() {
       if (metadataBuilder_ == null) {
         metadataBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.ResultSetMetadata,
-                com.google.spanner.v1.ResultSetMetadata.Builder,
-                com.google.spanner.v1.ResultSetMetadataOrBuilder>(
+                ResultSetMetadata, ResultSetMetadata.Builder, ResultSetMetadataOrBuilder>(
                 getMetadata(), getParentForChildren(), isClean());
         metadata_ = null;
       }
@@ -2088,7 +2054,7 @@ public Builder addValues(int index, com.google.protobuf.Value.Builder builderFor
      *
      * repeated .google.protobuf.Value values = 2;
      */
-    public Builder addAllValues(java.lang.Iterable values) {
+    public Builder addAllValues(Iterable values) {
       if (valuesBuilder_ == null) {
         ensureValuesIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, values_);
@@ -2713,7 +2679,7 @@ public java.util.List getValuesBuilderList()
      *
      * @return The chunkedValue.
      */
-    @java.lang.Override
+    @Override
     public boolean getChunkedValue() {
       return chunkedValue_;
     }
@@ -2773,7 +2739,7 @@ public Builder clearChunkedValue() {
      *
      * @return The resumeToken.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ByteString getResumeToken() {
       return resumeToken_;
     }
@@ -2824,11 +2790,9 @@ public Builder clearResumeToken() {
       return this;
     }
 
-    private com.google.spanner.v1.ResultSetStats stats_;
+    private ResultSetStats stats_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.ResultSetStats,
-            com.google.spanner.v1.ResultSetStats.Builder,
-            com.google.spanner.v1.ResultSetStatsOrBuilder>
+            ResultSetStats, ResultSetStats.Builder, ResultSetStatsOrBuilder>
         statsBuilder_;
     /**
      *
@@ -2865,9 +2829,9 @@ public boolean hasStats() {
      *
      * @return The stats.
      */
-    public com.google.spanner.v1.ResultSetStats getStats() {
+    public ResultSetStats getStats() {
       if (statsBuilder_ == null) {
-        return stats_ == null ? com.google.spanner.v1.ResultSetStats.getDefaultInstance() : stats_;
+        return stats_ == null ? ResultSetStats.getDefaultInstance() : stats_;
       } else {
         return statsBuilder_.getMessage();
       }
@@ -2886,7 +2850,7 @@ public com.google.spanner.v1.ResultSetStats getStats() {
      *
      * .google.spanner.v1.ResultSetStats stats = 5;
      */
-    public Builder setStats(com.google.spanner.v1.ResultSetStats value) {
+    public Builder setStats(ResultSetStats value) {
       if (statsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2913,7 +2877,7 @@ public Builder setStats(com.google.spanner.v1.ResultSetStats value) {
      *
      * .google.spanner.v1.ResultSetStats stats = 5;
      */
-    public Builder setStats(com.google.spanner.v1.ResultSetStats.Builder builderForValue) {
+    public Builder setStats(ResultSetStats.Builder builderForValue) {
       if (statsBuilder_ == null) {
         stats_ = builderForValue.build();
         onChanged();
@@ -2937,13 +2901,10 @@ public Builder setStats(com.google.spanner.v1.ResultSetStats.Builder builderForV
      *
      * .google.spanner.v1.ResultSetStats stats = 5;
      */
-    public Builder mergeStats(com.google.spanner.v1.ResultSetStats value) {
+    public Builder mergeStats(ResultSetStats value) {
       if (statsBuilder_ == null) {
         if (stats_ != null) {
-          stats_ =
-              com.google.spanner.v1.ResultSetStats.newBuilder(stats_)
-                  .mergeFrom(value)
-                  .buildPartial();
+          stats_ = ResultSetStats.newBuilder(stats_).mergeFrom(value).buildPartial();
         } else {
           stats_ = value;
         }
@@ -2993,7 +2954,7 @@ public Builder clearStats() {
      *
      * .google.spanner.v1.ResultSetStats stats = 5;
      */
-    public com.google.spanner.v1.ResultSetStats.Builder getStatsBuilder() {
+    public ResultSetStats.Builder getStatsBuilder() {
 
       onChanged();
       return getStatsFieldBuilder().getBuilder();
@@ -3012,11 +2973,11 @@ public com.google.spanner.v1.ResultSetStats.Builder getStatsBuilder() {
      *
      * .google.spanner.v1.ResultSetStats stats = 5;
      */
-    public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
+    public ResultSetStatsOrBuilder getStatsOrBuilder() {
       if (statsBuilder_ != null) {
         return statsBuilder_.getMessageOrBuilder();
       } else {
-        return stats_ == null ? com.google.spanner.v1.ResultSetStats.getDefaultInstance() : stats_;
+        return stats_ == null ? ResultSetStats.getDefaultInstance() : stats_;
       }
     }
     /**
@@ -3034,28 +2995,24 @@ public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
      * .google.spanner.v1.ResultSetStats stats = 5;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.ResultSetStats,
-            com.google.spanner.v1.ResultSetStats.Builder,
-            com.google.spanner.v1.ResultSetStatsOrBuilder>
+            ResultSetStats, ResultSetStats.Builder, ResultSetStatsOrBuilder>
         getStatsFieldBuilder() {
       if (statsBuilder_ == null) {
         statsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.ResultSetStats,
-                com.google.spanner.v1.ResultSetStats.Builder,
-                com.google.spanner.v1.ResultSetStatsOrBuilder>(
+                ResultSetStats, ResultSetStats.Builder, ResultSetStatsOrBuilder>(
                 getStats(), getParentForChildren(), isClean());
         stats_ = null;
       }
       return statsBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3065,19 +3022,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.PartialResultSet)
-  private static final com.google.spanner.v1.PartialResultSet DEFAULT_INSTANCE;
+  private static final PartialResultSet DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.PartialResultSet();
+    DEFAULT_INSTANCE = new PartialResultSet();
   }
 
-  public static com.google.spanner.v1.PartialResultSet getDefaultInstance() {
+  public static PartialResultSet getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public PartialResultSet parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3090,13 +3047,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.PartialResultSet getDefaultInstanceForType() {
+  @Override
+  public PartialResultSet getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSetOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSetOrBuilder.java
index 60b851170f..546a592f39 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSetOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSetOrBuilder.java
@@ -48,7 +48,7 @@ public interface PartialResultSetOrBuilder
    *
    * @return The metadata.
    */
-  com.google.spanner.v1.ResultSetMetadata getMetadata();
+  ResultSetMetadata getMetadata();
   /**
    *
    *
@@ -59,7 +59,7 @@ public interface PartialResultSetOrBuilder
    *
    * .google.spanner.v1.ResultSetMetadata metadata = 1;
    */
-  com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder();
+  ResultSetMetadataOrBuilder getMetadataOrBuilder();
 
   /**
    *
@@ -467,7 +467,7 @@ public interface PartialResultSetOrBuilder
    *
    * @return The stats.
    */
-  com.google.spanner.v1.ResultSetStats getStats();
+  ResultSetStats getStats();
   /**
    *
    *
@@ -482,5 +482,5 @@ public interface PartialResultSetOrBuilder
    *
    * .google.spanner.v1.ResultSetStats stats = 5;
    */
-  com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder();
+  ResultSetStatsOrBuilder getStatsOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java
index 6c366b815b..f81bf09e78 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java
@@ -42,13 +42,13 @@ private Partition() {
     partitionToken_ = com.google.protobuf.ByteString.EMPTY;
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new Partition();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private Partition(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -96,17 +96,13 @@ private Partition(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_Partition_descriptor;
+    return SpannerProto.internal_static_google_spanner_v1_Partition_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_Partition_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.Partition.class, com.google.spanner.v1.Partition.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return SpannerProto.internal_static_google_spanner_v1_Partition_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(Partition.class, Builder.class);
   }
 
   public static final int PARTITION_TOKEN_FIELD_NUMBER = 1;
@@ -124,14 +120,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The partitionToken.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ByteString getPartitionToken() {
     return partitionToken_;
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -141,7 +137,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!partitionToken_.isEmpty()) {
       output.writeBytes(1, partitionToken_);
@@ -149,7 +145,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -163,22 +159,22 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.Partition)) {
+    if (!(obj instanceof Partition)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.Partition other = (com.google.spanner.v1.Partition) obj;
+    Partition other = (Partition) obj;
 
     if (!getPartitionToken().equals(other.getPartitionToken())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -192,70 +188,68 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.Partition parseFrom(java.nio.ByteBuffer data)
+  public static Partition parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Partition parseFrom(
+  public static Partition parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.Partition parseFrom(com.google.protobuf.ByteString data)
+  public static Partition parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Partition parseFrom(
+  public static Partition 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.spanner.v1.Partition parseFrom(byte[] data)
+  public static Partition parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Partition parseFrom(
+  public static Partition parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.Partition parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static Partition parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Partition parseFrom(
+  public static Partition 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.spanner.v1.Partition parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static Partition parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Partition parseDelimitedFrom(
+  public static Partition 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.spanner.v1.Partition parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static Partition parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Partition parseFrom(
+  public static Partition parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -263,7 +257,7 @@ public static com.google.spanner.v1.Partition parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -272,17 +266,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.Partition prototype) {
+  public static Builder newBuilder(Partition prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -299,19 +293,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.Partition)
-      com.google.spanner.v1.PartitionOrBuilder {
+      PartitionOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_Partition_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_Partition_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_Partition_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.Partition.class, com.google.spanner.v1.Partition.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return SpannerProto.internal_static_google_spanner_v1_Partition_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(Partition.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.Partition.newBuilder()
@@ -319,7 +309,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -328,7 +318,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       partitionToken_ = com.google.protobuf.ByteString.EMPTY;
@@ -336,79 +326,77 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_Partition_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_Partition_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Partition getDefaultInstanceForType() {
-      return com.google.spanner.v1.Partition.getDefaultInstance();
+    @Override
+    public Partition getDefaultInstanceForType() {
+      return Partition.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Partition build() {
-      com.google.spanner.v1.Partition result = buildPartial();
+    @Override
+    public Partition build() {
+      Partition result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Partition buildPartial() {
-      com.google.spanner.v1.Partition result = new com.google.spanner.v1.Partition(this);
+    @Override
+    public Partition buildPartial() {
+      Partition result = new Partition(this);
       result.partitionToken_ = partitionToken_;
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.Partition) {
-        return mergeFrom((com.google.spanner.v1.Partition) other);
+      if (other instanceof Partition) {
+        return mergeFrom((Partition) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.Partition other) {
-      if (other == com.google.spanner.v1.Partition.getDefaultInstance()) return this;
+    public Builder mergeFrom(Partition other) {
+      if (other == Partition.getDefaultInstance()) return this;
       if (other.getPartitionToken() != com.google.protobuf.ByteString.EMPTY) {
         setPartitionToken(other.getPartitionToken());
       }
@@ -417,21 +405,21 @@ public Builder mergeFrom(com.google.spanner.v1.Partition other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.Partition parsedMessage = null;
+      Partition parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.Partition) e.getUnfinishedMessage();
+        parsedMessage = (Partition) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -455,7 +443,7 @@ public Builder mergeFrom(
      *
      * @return The partitionToken.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ByteString getPartitionToken() {
       return partitionToken_;
     }
@@ -502,12 +490,12 @@ public Builder clearPartitionToken() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -517,19 +505,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.Partition)
-  private static final com.google.spanner.v1.Partition DEFAULT_INSTANCE;
+  private static final Partition DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.Partition();
+    DEFAULT_INSTANCE = new Partition();
   }
 
-  public static com.google.spanner.v1.Partition getDefaultInstance() {
+  public static Partition getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public Partition parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -542,13 +530,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.Partition getDefaultInstanceForType() {
+  @Override
+  public Partition getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java
index 9f51c4c833..358de1863e 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java
@@ -40,13 +40,13 @@ private PartitionOptions(com.google.protobuf.GeneratedMessageV3.Builder build
 
   private PartitionOptions() {}
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new PartitionOptions();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -57,7 +57,7 @@ private PartitionOptions(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -99,18 +99,13 @@ private PartitionOptions(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_PartitionOptions_descriptor;
+    return SpannerProto.internal_static_google_spanner_v1_PartitionOptions_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_PartitionOptions_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.PartitionOptions.class,
-            com.google.spanner.v1.PartitionOptions.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return SpannerProto.internal_static_google_spanner_v1_PartitionOptions_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(PartitionOptions.class, Builder.class);
   }
 
   public static final int PARTITION_SIZE_BYTES_FIELD_NUMBER = 1;
@@ -130,7 +125,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The partitionSizeBytes.
    */
-  @java.lang.Override
+  @Override
   public long getPartitionSizeBytes() {
     return partitionSizeBytes_;
   }
@@ -154,14 +149,14 @@ public long getPartitionSizeBytes() {
    *
    * @return The maxPartitions.
    */
-  @java.lang.Override
+  @Override
   public long getMaxPartitions() {
     return maxPartitions_;
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -171,7 +166,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (partitionSizeBytes_ != 0L) {
       output.writeInt64(1, partitionSizeBytes_);
@@ -182,7 +177,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -199,15 +194,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.PartitionOptions)) {
+    if (!(obj instanceof PartitionOptions)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.PartitionOptions other = (com.google.spanner.v1.PartitionOptions) obj;
+    PartitionOptions other = (PartitionOptions) obj;
 
     if (getPartitionSizeBytes() != other.getPartitionSizeBytes()) return false;
     if (getMaxPartitions() != other.getMaxPartitions()) return false;
@@ -215,7 +210,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -231,71 +226,69 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.PartitionOptions parseFrom(java.nio.ByteBuffer data)
+  public static PartitionOptions parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartitionOptions parseFrom(
+  public static PartitionOptions parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.PartitionOptions parseFrom(
-      com.google.protobuf.ByteString data)
+  public static PartitionOptions parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartitionOptions parseFrom(
+  public static PartitionOptions 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.spanner.v1.PartitionOptions parseFrom(byte[] data)
+  public static PartitionOptions parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartitionOptions parseFrom(
+  public static PartitionOptions parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.PartitionOptions parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static PartitionOptions parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartitionOptions parseFrom(
+  public static PartitionOptions 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.spanner.v1.PartitionOptions parseDelimitedFrom(java.io.InputStream input)
+  public static PartitionOptions parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartitionOptions parseDelimitedFrom(
+  public static PartitionOptions 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.spanner.v1.PartitionOptions parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static PartitionOptions parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartitionOptions parseFrom(
+  public static PartitionOptions parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -303,7 +296,7 @@ public static com.google.spanner.v1.PartitionOptions parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -312,17 +305,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.PartitionOptions prototype) {
+  public static Builder newBuilder(PartitionOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -339,20 +332,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.PartitionOptions)
-      com.google.spanner.v1.PartitionOptionsOrBuilder {
+      PartitionOptionsOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_PartitionOptions_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_PartitionOptions_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_PartitionOptions_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.PartitionOptions.class,
-              com.google.spanner.v1.PartitionOptions.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return SpannerProto.internal_static_google_spanner_v1_PartitionOptions_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(PartitionOptions.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.PartitionOptions.newBuilder()
@@ -360,7 +348,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -369,7 +357,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       partitionSizeBytes_ = 0L;
@@ -379,81 +367,78 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_PartitionOptions_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_PartitionOptions_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartitionOptions getDefaultInstanceForType() {
-      return com.google.spanner.v1.PartitionOptions.getDefaultInstance();
+    @Override
+    public PartitionOptions getDefaultInstanceForType() {
+      return PartitionOptions.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartitionOptions build() {
-      com.google.spanner.v1.PartitionOptions result = buildPartial();
+    @Override
+    public PartitionOptions build() {
+      PartitionOptions result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartitionOptions buildPartial() {
-      com.google.spanner.v1.PartitionOptions result =
-          new com.google.spanner.v1.PartitionOptions(this);
+    @Override
+    public PartitionOptions buildPartial() {
+      PartitionOptions result = new PartitionOptions(this);
       result.partitionSizeBytes_ = partitionSizeBytes_;
       result.maxPartitions_ = maxPartitions_;
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.PartitionOptions) {
-        return mergeFrom((com.google.spanner.v1.PartitionOptions) other);
+      if (other instanceof PartitionOptions) {
+        return mergeFrom((PartitionOptions) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.PartitionOptions other) {
-      if (other == com.google.spanner.v1.PartitionOptions.getDefaultInstance()) return this;
+    public Builder mergeFrom(PartitionOptions other) {
+      if (other == PartitionOptions.getDefaultInstance()) return this;
       if (other.getPartitionSizeBytes() != 0L) {
         setPartitionSizeBytes(other.getPartitionSizeBytes());
       }
@@ -465,21 +450,21 @@ public Builder mergeFrom(com.google.spanner.v1.PartitionOptions other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.PartitionOptions parsedMessage = null;
+      PartitionOptions parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.PartitionOptions) e.getUnfinishedMessage();
+        parsedMessage = (PartitionOptions) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -505,7 +490,7 @@ public Builder mergeFrom(
      *
      * @return The partitionSizeBytes.
      */
-    @java.lang.Override
+    @Override
     public long getPartitionSizeBytes() {
       return partitionSizeBytes_;
     }
@@ -571,7 +556,7 @@ public Builder clearPartitionSizeBytes() {
      *
      * @return The maxPartitions.
      */
-    @java.lang.Override
+    @Override
     public long getMaxPartitions() {
       return maxPartitions_;
     }
@@ -623,12 +608,12 @@ public Builder clearMaxPartitions() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -638,19 +623,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.PartitionOptions)
-  private static final com.google.spanner.v1.PartitionOptions DEFAULT_INSTANCE;
+  private static final PartitionOptions DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.PartitionOptions();
+    DEFAULT_INSTANCE = new PartitionOptions();
   }
 
-  public static com.google.spanner.v1.PartitionOptions getDefaultInstance() {
+  public static PartitionOptions getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public PartitionOptions parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -663,13 +648,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.PartitionOptions getDefaultInstanceForType() {
+  @Override
+  public PartitionOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java
index f7fc78454c..3da45a8791 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java
@@ -42,13 +42,13 @@ private PartitionQueryRequest() {
     sql_ = "";
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new PartitionQueryRequest();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private PartitionQueryRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -74,20 +74,18 @@ private PartitionQueryRequest(
             break;
           case 10:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               session_ = s;
               break;
             }
           case 18:
             {
-              com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
+              TransactionSelector.Builder subBuilder = null;
               if (transaction_ != null) {
                 subBuilder = transaction_.toBuilder();
               }
-              transaction_ =
-                  input.readMessage(
-                      com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
+              transaction_ = input.readMessage(TransactionSelector.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(transaction_);
                 transaction_ = subBuilder.buildPartial();
@@ -97,7 +95,7 @@ private PartitionQueryRequest(
             }
           case 26:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               sql_ = s;
               break;
@@ -124,23 +122,20 @@ private PartitionQueryRequest(
                         ParamTypesDefaultEntryHolder.defaultEntry);
                 mutable_bitField0_ |= 0x00000001;
               }
-              com.google.protobuf.MapEntry
-                  paramTypes__ =
-                      input.readMessage(
-                          ParamTypesDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
+              com.google.protobuf.MapEntry paramTypes__ =
+                  input.readMessage(
+                      ParamTypesDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
               paramTypes_.getMutableMap().put(paramTypes__.getKey(), paramTypes__.getValue());
               break;
             }
           case 50:
             {
-              com.google.spanner.v1.PartitionOptions.Builder subBuilder = null;
+              PartitionOptions.Builder subBuilder = null;
               if (partitionOptions_ != null) {
                 subBuilder = partitionOptions_.toBuilder();
               }
-              partitionOptions_ =
-                  input.readMessage(
-                      com.google.spanner.v1.PartitionOptions.parser(), extensionRegistry);
+              partitionOptions_ = input.readMessage(PartitionOptions.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(partitionOptions_);
                 partitionOptions_ = subBuilder.buildPartial();
@@ -168,12 +163,11 @@ private PartitionQueryRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_PartitionQueryRequest_descriptor;
+    return SpannerProto.internal_static_google_spanner_v1_PartitionQueryRequest_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
+  @Override
   protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 5:
@@ -183,18 +177,14 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_PartitionQueryRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.PartitionQueryRequest.class,
-            com.google.spanner.v1.PartitionQueryRequest.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return SpannerProto.internal_static_google_spanner_v1_PartitionQueryRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(PartitionQueryRequest.class, Builder.class);
   }
 
   public static final int SESSION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object session_;
+  private volatile Object session_;
   /**
    *
    *
@@ -208,14 +198,14 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    *
    * @return The session.
    */
-  @java.lang.Override
-  public java.lang.String getSession() {
-    java.lang.Object ref = session_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getSession() {
+    Object ref = session_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       session_ = s;
       return s;
     }
@@ -233,12 +223,11 @@ public java.lang.String getSession() {
    *
    * @return The bytes for session.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ByteString getSessionBytes() {
-    java.lang.Object ref = session_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+    Object ref = session_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       session_ = b;
       return b;
     } else {
@@ -247,7 +236,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 2;
-  private com.google.spanner.v1.TransactionSelector transaction_;
+  private TransactionSelector transaction_;
   /**
    *
    *
@@ -260,7 +249,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
    *
    * @return Whether the transaction field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasTransaction() {
     return transaction_ != null;
   }
@@ -276,11 +265,9 @@ public boolean hasTransaction() {
    *
    * @return The transaction.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionSelector getTransaction() {
-    return transaction_ == null
-        ? com.google.spanner.v1.TransactionSelector.getDefaultInstance()
-        : transaction_;
+  @Override
+  public TransactionSelector getTransaction() {
+    return transaction_ == null ? TransactionSelector.getDefaultInstance() : transaction_;
   }
   /**
    *
@@ -292,13 +279,13 @@ public com.google.spanner.v1.TransactionSelector getTransaction() {
    *
    * .google.spanner.v1.TransactionSelector transaction = 2;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder() {
+  @Override
+  public TransactionSelectorOrBuilder getTransactionOrBuilder() {
     return getTransaction();
   }
 
   public static final int SQL_FIELD_NUMBER = 3;
-  private volatile java.lang.Object sql_;
+  private volatile Object sql_;
   /**
    *
    *
@@ -318,14 +305,14 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
    *
    * @return The sql.
    */
-  @java.lang.Override
-  public java.lang.String getSql() {
-    java.lang.Object ref = sql_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getSql() {
+    Object ref = sql_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       sql_ = s;
       return s;
     }
@@ -349,12 +336,11 @@ public java.lang.String getSql() {
    *
    * @return The bytes for sql.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ByteString getSqlBytes() {
-    java.lang.Object ref = sql_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+    Object ref = sql_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       sql_ = b;
       return b;
     } else {
@@ -382,7 +368,7 @@ public com.google.protobuf.ByteString getSqlBytes() {
    *
    * @return Whether the params field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasParams() {
     return params_ != null;
   }
@@ -404,7 +390,7 @@ public boolean hasParams() {
    *
    * @return The params.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Struct getParams() {
     return params_ == null ? com.google.protobuf.Struct.getDefaultInstance() : params_;
   }
@@ -424,7 +410,7 @@ public com.google.protobuf.Struct getParams() {
    *
    * .google.protobuf.Struct params = 4;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
     return getParams();
   }
@@ -432,22 +418,19 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
   public static final int PARAM_TYPES_FIELD_NUMBER = 5;
 
   private static final class ParamTypesDefaultEntryHolder {
-    static final com.google.protobuf.MapEntry
-        defaultEntry =
-            com.google.protobuf.MapEntry
-                .newDefaultInstance(
-                    com.google.spanner.v1.SpannerProto
-                        .internal_static_google_spanner_v1_PartitionQueryRequest_ParamTypesEntry_descriptor,
-                    com.google.protobuf.WireFormat.FieldType.STRING,
-                    "",
-                    com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                    com.google.spanner.v1.Type.getDefaultInstance());
+    static final com.google.protobuf.MapEntry defaultEntry =
+        com.google.protobuf.MapEntry.newDefaultInstance(
+            SpannerProto
+                .internal_static_google_spanner_v1_PartitionQueryRequest_ParamTypesEntry_descriptor,
+            com.google.protobuf.WireFormat.FieldType.STRING,
+            "",
+            com.google.protobuf.WireFormat.FieldType.MESSAGE,
+            Type.getDefaultInstance());
   }
 
-  private com.google.protobuf.MapField paramTypes_;
+  private com.google.protobuf.MapField paramTypes_;
 
-  private com.google.protobuf.MapField
-      internalGetParamTypes() {
+  private com.google.protobuf.MapField internalGetParamTypes() {
     if (paramTypes_ == null) {
       return com.google.protobuf.MapField.emptyMapField(ParamTypesDefaultEntryHolder.defaultEntry);
     }
@@ -472,17 +455,17 @@ public int getParamTypesCount() {
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  @java.lang.Override
-  public boolean containsParamTypes(java.lang.String key) {
+  @Override
+  public boolean containsParamTypes(String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     return internalGetParamTypes().getMap().containsKey(key);
   }
   /** Use {@link #getParamTypesMap()} instead. */
-  @java.lang.Override
-  @java.lang.Deprecated
-  public java.util.Map getParamTypes() {
+  @Override
+  @Deprecated
+  public java.util.Map getParamTypes() {
     return getParamTypesMap();
   }
   /**
@@ -500,8 +483,8 @@ public java.util.Map getParamTypes
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  @java.lang.Override
-  public java.util.Map getParamTypesMap() {
+  @Override
+  public java.util.Map getParamTypesMap() {
     return internalGetParamTypes().getMap();
   }
   /**
@@ -519,14 +502,12 @@ public java.util.Map getParamTypes
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Type getParamTypesOrDefault(
-      java.lang.String key, com.google.spanner.v1.Type defaultValue) {
+  @Override
+  public Type getParamTypesOrDefault(String key, Type defaultValue) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
-    java.util.Map map =
-        internalGetParamTypes().getMap();
+    java.util.Map map = internalGetParamTypes().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
   /**
@@ -544,21 +525,20 @@ public com.google.spanner.v1.Type getParamTypesOrDefault(
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Type getParamTypesOrThrow(java.lang.String key) {
+  @Override
+  public Type getParamTypesOrThrow(String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
-    java.util.Map map =
-        internalGetParamTypes().getMap();
+    java.util.Map map = internalGetParamTypes().getMap();
     if (!map.containsKey(key)) {
-      throw new java.lang.IllegalArgumentException();
+      throw new IllegalArgumentException();
     }
     return map.get(key);
   }
 
   public static final int PARTITION_OPTIONS_FIELD_NUMBER = 6;
-  private com.google.spanner.v1.PartitionOptions partitionOptions_;
+  private PartitionOptions partitionOptions_;
   /**
    *
    *
@@ -570,7 +550,7 @@ public com.google.spanner.v1.Type getParamTypesOrThrow(java.lang.String key) {
    *
    * @return Whether the partitionOptions field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasPartitionOptions() {
     return partitionOptions_ != null;
   }
@@ -585,11 +565,9 @@ public boolean hasPartitionOptions() {
    *
    * @return The partitionOptions.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.PartitionOptions getPartitionOptions() {
-    return partitionOptions_ == null
-        ? com.google.spanner.v1.PartitionOptions.getDefaultInstance()
-        : partitionOptions_;
+  @Override
+  public PartitionOptions getPartitionOptions() {
+    return partitionOptions_ == null ? PartitionOptions.getDefaultInstance() : partitionOptions_;
   }
   /**
    *
@@ -600,14 +578,14 @@ public com.google.spanner.v1.PartitionOptions getPartitionOptions() {
    *
    * .google.spanner.v1.PartitionOptions partition_options = 6;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
+  @Override
+  public PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
     return getPartitionOptions();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -617,7 +595,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, session_);
@@ -639,7 +617,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -657,9 +635,8 @@ public int getSerializedSize() {
     if (params_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getParams());
     }
-    for (java.util.Map.Entry entry :
-        internalGetParamTypes().getMap().entrySet()) {
-      com.google.protobuf.MapEntry paramTypes__ =
+    for (java.util.Map.Entry entry : internalGetParamTypes().getMap().entrySet()) {
+      com.google.protobuf.MapEntry paramTypes__ =
           ParamTypesDefaultEntryHolder.defaultEntry
               .newBuilderForType()
               .setKey(entry.getKey())
@@ -675,16 +652,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.PartitionQueryRequest)) {
+    if (!(obj instanceof PartitionQueryRequest)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.PartitionQueryRequest other =
-        (com.google.spanner.v1.PartitionQueryRequest) obj;
+    PartitionQueryRequest other = (PartitionQueryRequest) obj;
 
     if (!getSession().equals(other.getSession())) return false;
     if (hasTransaction() != other.hasTransaction()) return false;
@@ -705,7 +681,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -737,71 +713,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(java.nio.ByteBuffer data)
+  public static PartitionQueryRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
+  public static PartitionQueryRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
-      com.google.protobuf.ByteString data)
+  public static PartitionQueryRequest parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
+  public static PartitionQueryRequest 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.spanner.v1.PartitionQueryRequest parseFrom(byte[] data)
+  public static PartitionQueryRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
+  public static PartitionQueryRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(java.io.InputStream input)
+  public static PartitionQueryRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
+  public static PartitionQueryRequest 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.spanner.v1.PartitionQueryRequest parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
+  public static PartitionQueryRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartitionQueryRequest parseDelimitedFrom(
+  public static PartitionQueryRequest 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.spanner.v1.PartitionQueryRequest parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static PartitionQueryRequest parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
+  public static PartitionQueryRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -809,7 +784,7 @@ public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -818,17 +793,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.PartitionQueryRequest prototype) {
+  public static Builder newBuilder(PartitionQueryRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -844,10 +819,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.PartitionQueryRequest)
-      com.google.spanner.v1.PartitionQueryRequestOrBuilder {
+      PartitionQueryRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_PartitionQueryRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_PartitionQueryRequest_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -870,14 +844,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       }
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_PartitionQueryRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.PartitionQueryRequest.class,
-              com.google.spanner.v1.PartitionQueryRequest.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return SpannerProto.internal_static_google_spanner_v1_PartitionQueryRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(PartitionQueryRequest.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.PartitionQueryRequest.newBuilder()
@@ -885,7 +855,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -894,7 +864,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -923,30 +893,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_PartitionQueryRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_PartitionQueryRequest_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartitionQueryRequest getDefaultInstanceForType() {
-      return com.google.spanner.v1.PartitionQueryRequest.getDefaultInstance();
+    @Override
+    public PartitionQueryRequest getDefaultInstanceForType() {
+      return PartitionQueryRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartitionQueryRequest build() {
-      com.google.spanner.v1.PartitionQueryRequest result = buildPartial();
+    @Override
+    public PartitionQueryRequest build() {
+      PartitionQueryRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartitionQueryRequest buildPartial() {
-      com.google.spanner.v1.PartitionQueryRequest result =
-          new com.google.spanner.v1.PartitionQueryRequest(this);
+    @Override
+    public PartitionQueryRequest buildPartial() {
+      PartitionQueryRequest result = new PartitionQueryRequest(this);
       int from_bitField0_ = bitField0_;
       result.session_ = session_;
       if (transactionBuilder_ == null) {
@@ -971,51 +939,50 @@ public com.google.spanner.v1.PartitionQueryRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.PartitionQueryRequest) {
-        return mergeFrom((com.google.spanner.v1.PartitionQueryRequest) other);
+      if (other instanceof PartitionQueryRequest) {
+        return mergeFrom((PartitionQueryRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.PartitionQueryRequest other) {
-      if (other == com.google.spanner.v1.PartitionQueryRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(PartitionQueryRequest other) {
+      if (other == PartitionQueryRequest.getDefaultInstance()) return this;
       if (!other.getSession().isEmpty()) {
         session_ = other.session_;
         onChanged();
@@ -1039,21 +1006,21 @@ public Builder mergeFrom(com.google.spanner.v1.PartitionQueryRequest other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.PartitionQueryRequest parsedMessage = null;
+      PartitionQueryRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.PartitionQueryRequest) e.getUnfinishedMessage();
+        parsedMessage = (PartitionQueryRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -1065,7 +1032,7 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.lang.Object session_ = "";
+    private Object session_ = "";
     /**
      *
      *
@@ -1079,15 +1046,15 @@ public Builder mergeFrom(
      *
      * @return The session.
      */
-    public java.lang.String getSession() {
-      java.lang.Object ref = session_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getSession() {
+      Object ref = session_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         session_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -1104,10 +1071,10 @@ public java.lang.String getSession() {
      * @return The bytes for session.
      */
     public com.google.protobuf.ByteString getSessionBytes() {
-      java.lang.Object ref = session_;
+      Object ref = session_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         session_ = b;
         return b;
       } else {
@@ -1128,7 +1095,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
      * @param value The session to set.
      * @return This builder for chaining.
      */
-    public Builder setSession(java.lang.String value) {
+    public Builder setSession(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1181,11 +1148,9 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.spanner.v1.TransactionSelector transaction_;
+    private TransactionSelector transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionSelector,
-            com.google.spanner.v1.TransactionSelector.Builder,
-            com.google.spanner.v1.TransactionSelectorOrBuilder>
+            TransactionSelector, TransactionSelector.Builder, TransactionSelectorOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -1214,11 +1179,9 @@ public boolean hasTransaction() {
      *
      * @return The transaction.
      */
-    public com.google.spanner.v1.TransactionSelector getTransaction() {
+    public TransactionSelector getTransaction() {
       if (transactionBuilder_ == null) {
-        return transaction_ == null
-            ? com.google.spanner.v1.TransactionSelector.getDefaultInstance()
-            : transaction_;
+        return transaction_ == null ? TransactionSelector.getDefaultInstance() : transaction_;
       } else {
         return transactionBuilder_.getMessage();
       }
@@ -1233,7 +1196,7 @@ public com.google.spanner.v1.TransactionSelector getTransaction() {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public Builder setTransaction(com.google.spanner.v1.TransactionSelector value) {
+    public Builder setTransaction(TransactionSelector value) {
       if (transactionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1256,8 +1219,7 @@ public Builder setTransaction(com.google.spanner.v1.TransactionSelector value) {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public Builder setTransaction(
-        com.google.spanner.v1.TransactionSelector.Builder builderForValue) {
+    public Builder setTransaction(TransactionSelector.Builder builderForValue) {
       if (transactionBuilder_ == null) {
         transaction_ = builderForValue.build();
         onChanged();
@@ -1277,13 +1239,11 @@ public Builder setTransaction(
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public Builder mergeTransaction(com.google.spanner.v1.TransactionSelector value) {
+    public Builder mergeTransaction(TransactionSelector value) {
       if (transactionBuilder_ == null) {
         if (transaction_ != null) {
           transaction_ =
-              com.google.spanner.v1.TransactionSelector.newBuilder(transaction_)
-                  .mergeFrom(value)
-                  .buildPartial();
+              TransactionSelector.newBuilder(transaction_).mergeFrom(value).buildPartial();
         } else {
           transaction_ = value;
         }
@@ -1325,7 +1285,7 @@ public Builder clearTransaction() {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public com.google.spanner.v1.TransactionSelector.Builder getTransactionBuilder() {
+    public TransactionSelector.Builder getTransactionBuilder() {
 
       onChanged();
       return getTransactionFieldBuilder().getBuilder();
@@ -1340,13 +1300,11 @@ public com.google.spanner.v1.TransactionSelector.Builder getTransactionBuilder()
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder() {
+    public TransactionSelectorOrBuilder getTransactionOrBuilder() {
       if (transactionBuilder_ != null) {
         return transactionBuilder_.getMessageOrBuilder();
       } else {
-        return transaction_ == null
-            ? com.google.spanner.v1.TransactionSelector.getDefaultInstance()
-            : transaction_;
+        return transaction_ == null ? TransactionSelector.getDefaultInstance() : transaction_;
       }
     }
     /**
@@ -1360,23 +1318,19 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionSelector,
-            com.google.spanner.v1.TransactionSelector.Builder,
-            com.google.spanner.v1.TransactionSelectorOrBuilder>
+            TransactionSelector, TransactionSelector.Builder, TransactionSelectorOrBuilder>
         getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.TransactionSelector,
-                com.google.spanner.v1.TransactionSelector.Builder,
-                com.google.spanner.v1.TransactionSelectorOrBuilder>(
+                TransactionSelector, TransactionSelector.Builder, TransactionSelectorOrBuilder>(
                 getTransaction(), getParentForChildren(), isClean());
         transaction_ = null;
       }
       return transactionBuilder_;
     }
 
-    private java.lang.Object sql_ = "";
+    private Object sql_ = "";
     /**
      *
      *
@@ -1396,15 +1350,15 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
      *
      * @return The sql.
      */
-    public java.lang.String getSql() {
-      java.lang.Object ref = sql_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getSql() {
+      Object ref = sql_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         sql_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -1427,10 +1381,10 @@ public java.lang.String getSql() {
      * @return The bytes for sql.
      */
     public com.google.protobuf.ByteString getSqlBytes() {
-      java.lang.Object ref = sql_;
+      Object ref = sql_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         sql_ = b;
         return b;
       } else {
@@ -1457,7 +1411,7 @@ public com.google.protobuf.ByteString getSqlBytes() {
      * @param value The sql to set.
      * @return This builder for chaining.
      */
-    public Builder setSql(java.lang.String value) {
+    public Builder setSql(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1763,10 +1717,9 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
       return paramsBuilder_;
     }
 
-    private com.google.protobuf.MapField paramTypes_;
+    private com.google.protobuf.MapField paramTypes_;
 
-    private com.google.protobuf.MapField
-        internalGetParamTypes() {
+    private com.google.protobuf.MapField internalGetParamTypes() {
       if (paramTypes_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             ParamTypesDefaultEntryHolder.defaultEntry);
@@ -1774,8 +1727,7 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
       return paramTypes_;
     }
 
-    private com.google.protobuf.MapField
-        internalGetMutableParamTypes() {
+    private com.google.protobuf.MapField internalGetMutableParamTypes() {
       onChanged();
       ;
       if (paramTypes_ == null) {
@@ -1806,17 +1758,17 @@ public int getParamTypesCount() {
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    @java.lang.Override
-    public boolean containsParamTypes(java.lang.String key) {
+    @Override
+    public boolean containsParamTypes(String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       return internalGetParamTypes().getMap().containsKey(key);
     }
     /** Use {@link #getParamTypesMap()} instead. */
-    @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map getParamTypes() {
+    @Override
+    @Deprecated
+    public java.util.Map getParamTypes() {
       return getParamTypesMap();
     }
     /**
@@ -1834,8 +1786,8 @@ public java.util.Map getParamTypes
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    @java.lang.Override
-    public java.util.Map getParamTypesMap() {
+    @Override
+    public java.util.Map getParamTypesMap() {
       return internalGetParamTypes().getMap();
     }
     /**
@@ -1853,14 +1805,12 @@ public java.util.Map getParamTypes
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.Type getParamTypesOrDefault(
-        java.lang.String key, com.google.spanner.v1.Type defaultValue) {
+    @Override
+    public Type getParamTypesOrDefault(String key, Type defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
-      java.util.Map map =
-          internalGetParamTypes().getMap();
+      java.util.Map map = internalGetParamTypes().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
@@ -1878,15 +1828,14 @@ public com.google.spanner.v1.Type getParamTypesOrDefault(
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.Type getParamTypesOrThrow(java.lang.String key) {
+    @Override
+    public Type getParamTypesOrThrow(String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
-      java.util.Map map =
-          internalGetParamTypes().getMap();
+      java.util.Map map = internalGetParamTypes().getMap();
       if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
+        throw new IllegalArgumentException();
       }
       return map.get(key);
     }
@@ -1910,16 +1859,16 @@ public Builder clearParamTypes() {
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    public Builder removeParamTypes(java.lang.String key) {
+    public Builder removeParamTypes(String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       internalGetMutableParamTypes().getMutableMap().remove(key);
       return this;
     }
     /** Use alternate mutation accessors instead. */
-    @java.lang.Deprecated
-    public java.util.Map getMutableParamTypes() {
+    @Deprecated
+    public java.util.Map getMutableParamTypes() {
       return internalGetMutableParamTypes().getMutableMap();
     }
     /**
@@ -1937,12 +1886,12 @@ public java.util.Map getMutablePar
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    public Builder putParamTypes(java.lang.String key, com.google.spanner.v1.Type value) {
+    public Builder putParamTypes(String key, Type value) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       if (value == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       internalGetMutableParamTypes().getMutableMap().put(key, value);
       return this;
@@ -1962,17 +1911,14 @@ public Builder putParamTypes(java.lang.String key, com.google.spanner.v1.Type va
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    public Builder putAllParamTypes(
-        java.util.Map values) {
+    public Builder putAllParamTypes(java.util.Map values) {
       internalGetMutableParamTypes().getMutableMap().putAll(values);
       return this;
     }
 
-    private com.google.spanner.v1.PartitionOptions partitionOptions_;
+    private PartitionOptions partitionOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.PartitionOptions,
-            com.google.spanner.v1.PartitionOptions.Builder,
-            com.google.spanner.v1.PartitionOptionsOrBuilder>
+            PartitionOptions, PartitionOptions.Builder, PartitionOptionsOrBuilder>
         partitionOptionsBuilder_;
     /**
      *
@@ -1999,10 +1945,10 @@ public boolean hasPartitionOptions() {
      *
      * @return The partitionOptions.
      */
-    public com.google.spanner.v1.PartitionOptions getPartitionOptions() {
+    public PartitionOptions getPartitionOptions() {
       if (partitionOptionsBuilder_ == null) {
         return partitionOptions_ == null
-            ? com.google.spanner.v1.PartitionOptions.getDefaultInstance()
+            ? PartitionOptions.getDefaultInstance()
             : partitionOptions_;
       } else {
         return partitionOptionsBuilder_.getMessage();
@@ -2017,7 +1963,7 @@ public com.google.spanner.v1.PartitionOptions getPartitionOptions() {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 6;
      */
-    public Builder setPartitionOptions(com.google.spanner.v1.PartitionOptions value) {
+    public Builder setPartitionOptions(PartitionOptions value) {
       if (partitionOptionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2039,8 +1985,7 @@ public Builder setPartitionOptions(com.google.spanner.v1.PartitionOptions value)
      *
      * .google.spanner.v1.PartitionOptions partition_options = 6;
      */
-    public Builder setPartitionOptions(
-        com.google.spanner.v1.PartitionOptions.Builder builderForValue) {
+    public Builder setPartitionOptions(PartitionOptions.Builder builderForValue) {
       if (partitionOptionsBuilder_ == null) {
         partitionOptions_ = builderForValue.build();
         onChanged();
@@ -2059,13 +2004,11 @@ public Builder setPartitionOptions(
      *
      * .google.spanner.v1.PartitionOptions partition_options = 6;
      */
-    public Builder mergePartitionOptions(com.google.spanner.v1.PartitionOptions value) {
+    public Builder mergePartitionOptions(PartitionOptions value) {
       if (partitionOptionsBuilder_ == null) {
         if (partitionOptions_ != null) {
           partitionOptions_ =
-              com.google.spanner.v1.PartitionOptions.newBuilder(partitionOptions_)
-                  .mergeFrom(value)
-                  .buildPartial();
+              PartitionOptions.newBuilder(partitionOptions_).mergeFrom(value).buildPartial();
         } else {
           partitionOptions_ = value;
         }
@@ -2105,7 +2048,7 @@ public Builder clearPartitionOptions() {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 6;
      */
-    public com.google.spanner.v1.PartitionOptions.Builder getPartitionOptionsBuilder() {
+    public PartitionOptions.Builder getPartitionOptionsBuilder() {
 
       onChanged();
       return getPartitionOptionsFieldBuilder().getBuilder();
@@ -2119,12 +2062,12 @@ public com.google.spanner.v1.PartitionOptions.Builder getPartitionOptionsBuilder
      *
      * .google.spanner.v1.PartitionOptions partition_options = 6;
      */
-    public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
+    public PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
       if (partitionOptionsBuilder_ != null) {
         return partitionOptionsBuilder_.getMessageOrBuilder();
       } else {
         return partitionOptions_ == null
-            ? com.google.spanner.v1.PartitionOptions.getDefaultInstance()
+            ? PartitionOptions.getDefaultInstance()
             : partitionOptions_;
       }
     }
@@ -2138,28 +2081,24 @@ public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuil
      * .google.spanner.v1.PartitionOptions partition_options = 6;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.PartitionOptions,
-            com.google.spanner.v1.PartitionOptions.Builder,
-            com.google.spanner.v1.PartitionOptionsOrBuilder>
+            PartitionOptions, PartitionOptions.Builder, PartitionOptionsOrBuilder>
         getPartitionOptionsFieldBuilder() {
       if (partitionOptionsBuilder_ == null) {
         partitionOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.PartitionOptions,
-                com.google.spanner.v1.PartitionOptions.Builder,
-                com.google.spanner.v1.PartitionOptionsOrBuilder>(
+                PartitionOptions, PartitionOptions.Builder, PartitionOptionsOrBuilder>(
                 getPartitionOptions(), getParentForChildren(), isClean());
         partitionOptions_ = null;
       }
       return partitionOptionsBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2169,19 +2108,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.PartitionQueryRequest)
-  private static final com.google.spanner.v1.PartitionQueryRequest DEFAULT_INSTANCE;
+  private static final PartitionQueryRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.PartitionQueryRequest();
+    DEFAULT_INSTANCE = new PartitionQueryRequest();
   }
 
-  public static com.google.spanner.v1.PartitionQueryRequest getDefaultInstance() {
+  public static PartitionQueryRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public PartitionQueryRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2194,13 +2133,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.PartitionQueryRequest getDefaultInstanceForType() {
+  @Override
+  public PartitionQueryRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequestOrBuilder.java
index e771b3d289..dcae90106c 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface PartitionQueryRequestOrBuilder
    *
    * @return The session.
    */
-  java.lang.String getSession();
+  String getSession();
   /**
    *
    *
@@ -77,7 +77,7 @@ public interface PartitionQueryRequestOrBuilder
    *
    * @return The transaction.
    */
-  com.google.spanner.v1.TransactionSelector getTransaction();
+  TransactionSelector getTransaction();
   /**
    *
    *
@@ -88,7 +88,7 @@ public interface PartitionQueryRequestOrBuilder
    *
    * .google.spanner.v1.TransactionSelector transaction = 2;
    */
-  com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder();
+  TransactionSelectorOrBuilder getTransactionOrBuilder();
 
   /**
    *
@@ -109,7 +109,7 @@ public interface PartitionQueryRequestOrBuilder
    *
    * @return The sql.
    */
-  java.lang.String getSql();
+  String getSql();
   /**
    *
    *
@@ -218,10 +218,10 @@ public interface PartitionQueryRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  boolean containsParamTypes(java.lang.String key);
+  boolean containsParamTypes(String key);
   /** Use {@link #getParamTypesMap()} instead. */
-  @java.lang.Deprecated
-  java.util.Map getParamTypes();
+  @Deprecated
+  java.util.Map getParamTypes();
   /**
    *
    *
@@ -237,7 +237,7 @@ public interface PartitionQueryRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  java.util.Map getParamTypesMap();
+  java.util.Map getParamTypesMap();
   /**
    *
    *
@@ -253,8 +253,7 @@ public interface PartitionQueryRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  com.google.spanner.v1.Type getParamTypesOrDefault(
-      java.lang.String key, com.google.spanner.v1.Type defaultValue);
+  Type getParamTypesOrDefault(String key, Type defaultValue);
   /**
    *
    *
@@ -270,7 +269,7 @@ com.google.spanner.v1.Type getParamTypesOrDefault(
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  com.google.spanner.v1.Type getParamTypesOrThrow(java.lang.String key);
+  Type getParamTypesOrThrow(String key);
 
   /**
    *
@@ -295,7 +294,7 @@ com.google.spanner.v1.Type getParamTypesOrDefault(
    *
    * @return The partitionOptions.
    */
-  com.google.spanner.v1.PartitionOptions getPartitionOptions();
+  PartitionOptions getPartitionOptions();
   /**
    *
    *
@@ -305,5 +304,5 @@ com.google.spanner.v1.Type getParamTypesOrDefault(
    *
    * .google.spanner.v1.PartitionOptions partition_options = 6;
    */
-  com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuilder();
+  PartitionOptionsOrBuilder getPartitionOptionsOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java
index 0639cae76b..63f3e7cbd2 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java
@@ -44,13 +44,13 @@ private PartitionReadRequest() {
     columns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new PartitionReadRequest();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -61,7 +61,7 @@ private PartitionReadRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -76,20 +76,18 @@ private PartitionReadRequest(
             break;
           case 10:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               session_ = s;
               break;
             }
           case 18:
             {
-              com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
+              TransactionSelector.Builder subBuilder = null;
               if (transaction_ != null) {
                 subBuilder = transaction_.toBuilder();
               }
-              transaction_ =
-                  input.readMessage(
-                      com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
+              transaction_ = input.readMessage(TransactionSelector.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(transaction_);
                 transaction_ = subBuilder.buildPartial();
@@ -99,21 +97,21 @@ private PartitionReadRequest(
             }
           case 26:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               table_ = s;
               break;
             }
           case 34:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               index_ = s;
               break;
             }
           case 42:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 columns_ = new com.google.protobuf.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000001;
@@ -123,11 +121,11 @@ private PartitionReadRequest(
             }
           case 50:
             {
-              com.google.spanner.v1.KeySet.Builder subBuilder = null;
+              KeySet.Builder subBuilder = null;
               if (keySet_ != null) {
                 subBuilder = keySet_.toBuilder();
               }
-              keySet_ = input.readMessage(com.google.spanner.v1.KeySet.parser(), extensionRegistry);
+              keySet_ = input.readMessage(KeySet.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(keySet_);
                 keySet_ = subBuilder.buildPartial();
@@ -137,13 +135,11 @@ private PartitionReadRequest(
             }
           case 74:
             {
-              com.google.spanner.v1.PartitionOptions.Builder subBuilder = null;
+              PartitionOptions.Builder subBuilder = null;
               if (partitionOptions_ != null) {
                 subBuilder = partitionOptions_.toBuilder();
               }
-              partitionOptions_ =
-                  input.readMessage(
-                      com.google.spanner.v1.PartitionOptions.parser(), extensionRegistry);
+              partitionOptions_ = input.readMessage(PartitionOptions.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(partitionOptions_);
                 partitionOptions_ = subBuilder.buildPartial();
@@ -174,22 +170,17 @@ private PartitionReadRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
+    return SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_PartitionReadRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.PartitionReadRequest.class,
-            com.google.spanner.v1.PartitionReadRequest.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(PartitionReadRequest.class, Builder.class);
   }
 
   public static final int SESSION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object session_;
+  private volatile Object session_;
   /**
    *
    *
@@ -203,14 +194,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The session.
    */
-  @java.lang.Override
-  public java.lang.String getSession() {
-    java.lang.Object ref = session_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getSession() {
+    Object ref = session_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       session_ = s;
       return s;
     }
@@ -228,12 +219,11 @@ public java.lang.String getSession() {
    *
    * @return The bytes for session.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ByteString getSessionBytes() {
-    java.lang.Object ref = session_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+    Object ref = session_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       session_ = b;
       return b;
     } else {
@@ -242,7 +232,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 2;
-  private com.google.spanner.v1.TransactionSelector transaction_;
+  private TransactionSelector transaction_;
   /**
    *
    *
@@ -255,7 +245,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
    *
    * @return Whether the transaction field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasTransaction() {
     return transaction_ != null;
   }
@@ -271,11 +261,9 @@ public boolean hasTransaction() {
    *
    * @return The transaction.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionSelector getTransaction() {
-    return transaction_ == null
-        ? com.google.spanner.v1.TransactionSelector.getDefaultInstance()
-        : transaction_;
+  @Override
+  public TransactionSelector getTransaction() {
+    return transaction_ == null ? TransactionSelector.getDefaultInstance() : transaction_;
   }
   /**
    *
@@ -287,13 +275,13 @@ public com.google.spanner.v1.TransactionSelector getTransaction() {
    *
    * .google.spanner.v1.TransactionSelector transaction = 2;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder() {
+  @Override
+  public TransactionSelectorOrBuilder getTransactionOrBuilder() {
     return getTransaction();
   }
 
   public static final int TABLE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object table_;
+  private volatile Object table_;
   /**
    *
    *
@@ -305,14 +293,14 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
    *
    * @return The table.
    */
-  @java.lang.Override
-  public java.lang.String getTable() {
-    java.lang.Object ref = table_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getTable() {
+    Object ref = table_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       table_ = s;
       return s;
     }
@@ -328,12 +316,11 @@ public java.lang.String getTable() {
    *
    * @return The bytes for table.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ByteString getTableBytes() {
-    java.lang.Object ref = table_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+    Object ref = table_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       table_ = b;
       return b;
     } else {
@@ -342,7 +329,7 @@ public com.google.protobuf.ByteString getTableBytes() {
   }
 
   public static final int INDEX_FIELD_NUMBER = 4;
-  private volatile java.lang.Object index_;
+  private volatile Object index_;
   /**
    *
    *
@@ -356,14 +343,14 @@ public com.google.protobuf.ByteString getTableBytes() {
    *
    * @return The index.
    */
-  @java.lang.Override
-  public java.lang.String getIndex() {
-    java.lang.Object ref = index_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getIndex() {
+    Object ref = index_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       index_ = s;
       return s;
     }
@@ -381,12 +368,11 @@ public java.lang.String getIndex() {
    *
    * @return The bytes for index.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ByteString getIndexBytes() {
-    java.lang.Object ref = index_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+    Object ref = index_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       index_ = b;
       return b;
     } else {
@@ -439,7 +425,7 @@ public int getColumnsCount() {
    * @param index The index of the element to return.
    * @return The columns at the given index.
    */
-  public java.lang.String getColumns(int index) {
+  public String getColumns(int index) {
     return columns_.get(index);
   }
   /**
@@ -460,7 +446,7 @@ public com.google.protobuf.ByteString getColumnsBytes(int index) {
   }
 
   public static final int KEY_SET_FIELD_NUMBER = 6;
-  private com.google.spanner.v1.KeySet keySet_;
+  private KeySet keySet_;
   /**
    *
    *
@@ -477,7 +463,7 @@ public com.google.protobuf.ByteString getColumnsBytes(int index) {
    *
    * @return Whether the keySet field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasKeySet() {
     return keySet_ != null;
   }
@@ -497,9 +483,9 @@ public boolean hasKeySet() {
    *
    * @return The keySet.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.KeySet getKeySet() {
-    return keySet_ == null ? com.google.spanner.v1.KeySet.getDefaultInstance() : keySet_;
+  @Override
+  public KeySet getKeySet() {
+    return keySet_ == null ? KeySet.getDefaultInstance() : keySet_;
   }
   /**
    *
@@ -515,13 +501,13 @@ public com.google.spanner.v1.KeySet getKeySet() {
    *
    * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
    */
-  @java.lang.Override
-  public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
+  @Override
+  public KeySetOrBuilder getKeySetOrBuilder() {
     return getKeySet();
   }
 
   public static final int PARTITION_OPTIONS_FIELD_NUMBER = 9;
-  private com.google.spanner.v1.PartitionOptions partitionOptions_;
+  private PartitionOptions partitionOptions_;
   /**
    *
    *
@@ -533,7 +519,7 @@ public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
    *
    * @return Whether the partitionOptions field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasPartitionOptions() {
     return partitionOptions_ != null;
   }
@@ -548,11 +534,9 @@ public boolean hasPartitionOptions() {
    *
    * @return The partitionOptions.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.PartitionOptions getPartitionOptions() {
-    return partitionOptions_ == null
-        ? com.google.spanner.v1.PartitionOptions.getDefaultInstance()
-        : partitionOptions_;
+  @Override
+  public PartitionOptions getPartitionOptions() {
+    return partitionOptions_ == null ? PartitionOptions.getDefaultInstance() : partitionOptions_;
   }
   /**
    *
@@ -563,14 +547,14 @@ public com.google.spanner.v1.PartitionOptions getPartitionOptions() {
    *
    * .google.spanner.v1.PartitionOptions partition_options = 9;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
+  @Override
+  public PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
     return getPartitionOptions();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -580,7 +564,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, session_);
@@ -606,7 +590,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -643,16 +627,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.PartitionReadRequest)) {
+    if (!(obj instanceof PartitionReadRequest)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.PartitionReadRequest other =
-        (com.google.spanner.v1.PartitionReadRequest) obj;
+    PartitionReadRequest other = (PartitionReadRequest) obj;
 
     if (!getSession().equals(other.getSession())) return false;
     if (hasTransaction() != other.hasTransaction()) return false;
@@ -674,7 +657,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -708,71 +691,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.PartitionReadRequest parseFrom(java.nio.ByteBuffer data)
+  public static PartitionReadRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartitionReadRequest parseFrom(
+  public static PartitionReadRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.PartitionReadRequest parseFrom(
-      com.google.protobuf.ByteString data)
+  public static PartitionReadRequest parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartitionReadRequest parseFrom(
+  public static PartitionReadRequest 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.spanner.v1.PartitionReadRequest parseFrom(byte[] data)
+  public static PartitionReadRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartitionReadRequest parseFrom(
+  public static PartitionReadRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.PartitionReadRequest parseFrom(java.io.InputStream input)
+  public static PartitionReadRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartitionReadRequest parseFrom(
+  public static PartitionReadRequest 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.spanner.v1.PartitionReadRequest parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
+  public static PartitionReadRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartitionReadRequest parseDelimitedFrom(
+  public static PartitionReadRequest 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.spanner.v1.PartitionReadRequest parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static PartitionReadRequest parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartitionReadRequest parseFrom(
+  public static PartitionReadRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -780,7 +762,7 @@ public static com.google.spanner.v1.PartitionReadRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -789,17 +771,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.PartitionReadRequest prototype) {
+  public static Builder newBuilder(PartitionReadRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -815,20 +797,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.PartitionReadRequest)
-      com.google.spanner.v1.PartitionReadRequestOrBuilder {
+      PartitionReadRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_PartitionReadRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.PartitionReadRequest.class,
-              com.google.spanner.v1.PartitionReadRequest.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(PartitionReadRequest.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.PartitionReadRequest.newBuilder()
@@ -836,7 +813,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -845,7 +822,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -877,30 +854,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartitionReadRequest getDefaultInstanceForType() {
-      return com.google.spanner.v1.PartitionReadRequest.getDefaultInstance();
+    @Override
+    public PartitionReadRequest getDefaultInstanceForType() {
+      return PartitionReadRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartitionReadRequest build() {
-      com.google.spanner.v1.PartitionReadRequest result = buildPartial();
+    @Override
+    public PartitionReadRequest build() {
+      PartitionReadRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartitionReadRequest buildPartial() {
-      com.google.spanner.v1.PartitionReadRequest result =
-          new com.google.spanner.v1.PartitionReadRequest(this);
+    @Override
+    public PartitionReadRequest buildPartial() {
+      PartitionReadRequest result = new PartitionReadRequest(this);
       int from_bitField0_ = bitField0_;
       result.session_ = session_;
       if (transactionBuilder_ == null) {
@@ -929,51 +904,50 @@ public com.google.spanner.v1.PartitionReadRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.PartitionReadRequest) {
-        return mergeFrom((com.google.spanner.v1.PartitionReadRequest) other);
+      if (other instanceof PartitionReadRequest) {
+        return mergeFrom((PartitionReadRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.PartitionReadRequest other) {
-      if (other == com.google.spanner.v1.PartitionReadRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(PartitionReadRequest other) {
+      if (other == PartitionReadRequest.getDefaultInstance()) return this;
       if (!other.getSession().isEmpty()) {
         session_ = other.session_;
         onChanged();
@@ -1010,21 +984,21 @@ public Builder mergeFrom(com.google.spanner.v1.PartitionReadRequest other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.PartitionReadRequest parsedMessage = null;
+      PartitionReadRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.PartitionReadRequest) e.getUnfinishedMessage();
+        parsedMessage = (PartitionReadRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -1036,7 +1010,7 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.lang.Object session_ = "";
+    private Object session_ = "";
     /**
      *
      *
@@ -1050,15 +1024,15 @@ public Builder mergeFrom(
      *
      * @return The session.
      */
-    public java.lang.String getSession() {
-      java.lang.Object ref = session_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getSession() {
+      Object ref = session_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         session_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -1075,10 +1049,10 @@ public java.lang.String getSession() {
      * @return The bytes for session.
      */
     public com.google.protobuf.ByteString getSessionBytes() {
-      java.lang.Object ref = session_;
+      Object ref = session_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         session_ = b;
         return b;
       } else {
@@ -1099,7 +1073,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
      * @param value The session to set.
      * @return This builder for chaining.
      */
-    public Builder setSession(java.lang.String value) {
+    public Builder setSession(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1152,11 +1126,9 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.spanner.v1.TransactionSelector transaction_;
+    private TransactionSelector transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionSelector,
-            com.google.spanner.v1.TransactionSelector.Builder,
-            com.google.spanner.v1.TransactionSelectorOrBuilder>
+            TransactionSelector, TransactionSelector.Builder, TransactionSelectorOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -1185,11 +1157,9 @@ public boolean hasTransaction() {
      *
      * @return The transaction.
      */
-    public com.google.spanner.v1.TransactionSelector getTransaction() {
+    public TransactionSelector getTransaction() {
       if (transactionBuilder_ == null) {
-        return transaction_ == null
-            ? com.google.spanner.v1.TransactionSelector.getDefaultInstance()
-            : transaction_;
+        return transaction_ == null ? TransactionSelector.getDefaultInstance() : transaction_;
       } else {
         return transactionBuilder_.getMessage();
       }
@@ -1204,7 +1174,7 @@ public com.google.spanner.v1.TransactionSelector getTransaction() {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public Builder setTransaction(com.google.spanner.v1.TransactionSelector value) {
+    public Builder setTransaction(TransactionSelector value) {
       if (transactionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1227,8 +1197,7 @@ public Builder setTransaction(com.google.spanner.v1.TransactionSelector value) {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public Builder setTransaction(
-        com.google.spanner.v1.TransactionSelector.Builder builderForValue) {
+    public Builder setTransaction(TransactionSelector.Builder builderForValue) {
       if (transactionBuilder_ == null) {
         transaction_ = builderForValue.build();
         onChanged();
@@ -1248,13 +1217,11 @@ public Builder setTransaction(
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public Builder mergeTransaction(com.google.spanner.v1.TransactionSelector value) {
+    public Builder mergeTransaction(TransactionSelector value) {
       if (transactionBuilder_ == null) {
         if (transaction_ != null) {
           transaction_ =
-              com.google.spanner.v1.TransactionSelector.newBuilder(transaction_)
-                  .mergeFrom(value)
-                  .buildPartial();
+              TransactionSelector.newBuilder(transaction_).mergeFrom(value).buildPartial();
         } else {
           transaction_ = value;
         }
@@ -1296,7 +1263,7 @@ public Builder clearTransaction() {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public com.google.spanner.v1.TransactionSelector.Builder getTransactionBuilder() {
+    public TransactionSelector.Builder getTransactionBuilder() {
 
       onChanged();
       return getTransactionFieldBuilder().getBuilder();
@@ -1311,13 +1278,11 @@ public com.google.spanner.v1.TransactionSelector.Builder getTransactionBuilder()
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder() {
+    public TransactionSelectorOrBuilder getTransactionOrBuilder() {
       if (transactionBuilder_ != null) {
         return transactionBuilder_.getMessageOrBuilder();
       } else {
-        return transaction_ == null
-            ? com.google.spanner.v1.TransactionSelector.getDefaultInstance()
-            : transaction_;
+        return transaction_ == null ? TransactionSelector.getDefaultInstance() : transaction_;
       }
     }
     /**
@@ -1331,23 +1296,19 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionSelector,
-            com.google.spanner.v1.TransactionSelector.Builder,
-            com.google.spanner.v1.TransactionSelectorOrBuilder>
+            TransactionSelector, TransactionSelector.Builder, TransactionSelectorOrBuilder>
         getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.TransactionSelector,
-                com.google.spanner.v1.TransactionSelector.Builder,
-                com.google.spanner.v1.TransactionSelectorOrBuilder>(
+                TransactionSelector, TransactionSelector.Builder, TransactionSelectorOrBuilder>(
                 getTransaction(), getParentForChildren(), isClean());
         transaction_ = null;
       }
       return transactionBuilder_;
     }
 
-    private java.lang.Object table_ = "";
+    private Object table_ = "";
     /**
      *
      *
@@ -1359,15 +1320,15 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
      *
      * @return The table.
      */
-    public java.lang.String getTable() {
-      java.lang.Object ref = table_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getTable() {
+      Object ref = table_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         table_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -1382,10 +1343,10 @@ public java.lang.String getTable() {
      * @return The bytes for table.
      */
     public com.google.protobuf.ByteString getTableBytes() {
-      java.lang.Object ref = table_;
+      Object ref = table_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         table_ = b;
         return b;
       } else {
@@ -1404,7 +1365,7 @@ public com.google.protobuf.ByteString getTableBytes() {
      * @param value The table to set.
      * @return This builder for chaining.
      */
-    public Builder setTable(java.lang.String value) {
+    public Builder setTable(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1453,7 +1414,7 @@ public Builder setTableBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private java.lang.Object index_ = "";
+    private Object index_ = "";
     /**
      *
      *
@@ -1467,15 +1428,15 @@ public Builder setTableBytes(com.google.protobuf.ByteString value) {
      *
      * @return The index.
      */
-    public java.lang.String getIndex() {
-      java.lang.Object ref = index_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getIndex() {
+      Object ref = index_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         index_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -1492,10 +1453,10 @@ public java.lang.String getIndex() {
      * @return The bytes for index.
      */
     public com.google.protobuf.ByteString getIndexBytes() {
-      java.lang.Object ref = index_;
+      Object ref = index_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         index_ = b;
         return b;
       } else {
@@ -1516,7 +1477,7 @@ public com.google.protobuf.ByteString getIndexBytes() {
      * @param value The index to set.
      * @return This builder for chaining.
      */
-    public Builder setIndex(java.lang.String value) {
+    public Builder setIndex(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1621,7 +1582,7 @@ public int getColumnsCount() {
      * @param index The index of the element to return.
      * @return The columns at the given index.
      */
-    public java.lang.String getColumns(int index) {
+    public String getColumns(int index) {
       return columns_.get(index);
     }
     /**
@@ -1654,7 +1615,7 @@ public com.google.protobuf.ByteString getColumnsBytes(int index) {
      * @param value The columns to set.
      * @return This builder for chaining.
      */
-    public Builder setColumns(int index, java.lang.String value) {
+    public Builder setColumns(int index, String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1676,7 +1637,7 @@ public Builder setColumns(int index, java.lang.String value) {
      * @param value The columns to add.
      * @return This builder for chaining.
      */
-    public Builder addColumns(java.lang.String value) {
+    public Builder addColumns(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1698,7 +1659,7 @@ public Builder addColumns(java.lang.String value) {
      * @param values The columns to add.
      * @return This builder for chaining.
      */
-    public Builder addAllColumns(java.lang.Iterable values) {
+    public Builder addAllColumns(Iterable values) {
       ensureColumnsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, columns_);
       onChanged();
@@ -1746,11 +1707,8 @@ public Builder addColumnsBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.spanner.v1.KeySet keySet_;
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.KeySet,
-            com.google.spanner.v1.KeySet.Builder,
-            com.google.spanner.v1.KeySetOrBuilder>
+    private KeySet keySet_;
+    private com.google.protobuf.SingleFieldBuilderV3
         keySetBuilder_;
     /**
      *
@@ -1787,9 +1745,9 @@ public boolean hasKeySet() {
      *
      * @return The keySet.
      */
-    public com.google.spanner.v1.KeySet getKeySet() {
+    public KeySet getKeySet() {
       if (keySetBuilder_ == null) {
-        return keySet_ == null ? com.google.spanner.v1.KeySet.getDefaultInstance() : keySet_;
+        return keySet_ == null ? KeySet.getDefaultInstance() : keySet_;
       } else {
         return keySetBuilder_.getMessage();
       }
@@ -1808,7 +1766,7 @@ public com.google.spanner.v1.KeySet getKeySet() {
      *
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder setKeySet(com.google.spanner.v1.KeySet value) {
+    public Builder setKeySet(KeySet value) {
       if (keySetBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1835,7 +1793,7 @@ public Builder setKeySet(com.google.spanner.v1.KeySet value) {
      *
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder setKeySet(com.google.spanner.v1.KeySet.Builder builderForValue) {
+    public Builder setKeySet(KeySet.Builder builderForValue) {
       if (keySetBuilder_ == null) {
         keySet_ = builderForValue.build();
         onChanged();
@@ -1859,11 +1817,10 @@ public Builder setKeySet(com.google.spanner.v1.KeySet.Builder builderForValue) {
      *
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder mergeKeySet(com.google.spanner.v1.KeySet value) {
+    public Builder mergeKeySet(KeySet value) {
       if (keySetBuilder_ == null) {
         if (keySet_ != null) {
-          keySet_ =
-              com.google.spanner.v1.KeySet.newBuilder(keySet_).mergeFrom(value).buildPartial();
+          keySet_ = KeySet.newBuilder(keySet_).mergeFrom(value).buildPartial();
         } else {
           keySet_ = value;
         }
@@ -1913,7 +1870,7 @@ public Builder clearKeySet() {
      *
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
-    public com.google.spanner.v1.KeySet.Builder getKeySetBuilder() {
+    public KeySet.Builder getKeySetBuilder() {
 
       onChanged();
       return getKeySetFieldBuilder().getBuilder();
@@ -1932,11 +1889,11 @@ public com.google.spanner.v1.KeySet.Builder getKeySetBuilder() {
      *
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
-    public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
+    public KeySetOrBuilder getKeySetOrBuilder() {
       if (keySetBuilder_ != null) {
         return keySetBuilder_.getMessageOrBuilder();
       } else {
-        return keySet_ == null ? com.google.spanner.v1.KeySet.getDefaultInstance() : keySet_;
+        return keySet_ == null ? KeySet.getDefaultInstance() : keySet_;
       }
     }
     /**
@@ -1953,28 +1910,20 @@ public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
      *
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.KeySet,
-            com.google.spanner.v1.KeySet.Builder,
-            com.google.spanner.v1.KeySetOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         getKeySetFieldBuilder() {
       if (keySetBuilder_ == null) {
         keySetBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.KeySet,
-                com.google.spanner.v1.KeySet.Builder,
-                com.google.spanner.v1.KeySetOrBuilder>(
+            new com.google.protobuf.SingleFieldBuilderV3(
                 getKeySet(), getParentForChildren(), isClean());
         keySet_ = null;
       }
       return keySetBuilder_;
     }
 
-    private com.google.spanner.v1.PartitionOptions partitionOptions_;
+    private PartitionOptions partitionOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.PartitionOptions,
-            com.google.spanner.v1.PartitionOptions.Builder,
-            com.google.spanner.v1.PartitionOptionsOrBuilder>
+            PartitionOptions, PartitionOptions.Builder, PartitionOptionsOrBuilder>
         partitionOptionsBuilder_;
     /**
      *
@@ -2001,10 +1950,10 @@ public boolean hasPartitionOptions() {
      *
      * @return The partitionOptions.
      */
-    public com.google.spanner.v1.PartitionOptions getPartitionOptions() {
+    public PartitionOptions getPartitionOptions() {
       if (partitionOptionsBuilder_ == null) {
         return partitionOptions_ == null
-            ? com.google.spanner.v1.PartitionOptions.getDefaultInstance()
+            ? PartitionOptions.getDefaultInstance()
             : partitionOptions_;
       } else {
         return partitionOptionsBuilder_.getMessage();
@@ -2019,7 +1968,7 @@ public com.google.spanner.v1.PartitionOptions getPartitionOptions() {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 9;
      */
-    public Builder setPartitionOptions(com.google.spanner.v1.PartitionOptions value) {
+    public Builder setPartitionOptions(PartitionOptions value) {
       if (partitionOptionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2041,8 +1990,7 @@ public Builder setPartitionOptions(com.google.spanner.v1.PartitionOptions value)
      *
      * .google.spanner.v1.PartitionOptions partition_options = 9;
      */
-    public Builder setPartitionOptions(
-        com.google.spanner.v1.PartitionOptions.Builder builderForValue) {
+    public Builder setPartitionOptions(PartitionOptions.Builder builderForValue) {
       if (partitionOptionsBuilder_ == null) {
         partitionOptions_ = builderForValue.build();
         onChanged();
@@ -2061,13 +2009,11 @@ public Builder setPartitionOptions(
      *
      * .google.spanner.v1.PartitionOptions partition_options = 9;
      */
-    public Builder mergePartitionOptions(com.google.spanner.v1.PartitionOptions value) {
+    public Builder mergePartitionOptions(PartitionOptions value) {
       if (partitionOptionsBuilder_ == null) {
         if (partitionOptions_ != null) {
           partitionOptions_ =
-              com.google.spanner.v1.PartitionOptions.newBuilder(partitionOptions_)
-                  .mergeFrom(value)
-                  .buildPartial();
+              PartitionOptions.newBuilder(partitionOptions_).mergeFrom(value).buildPartial();
         } else {
           partitionOptions_ = value;
         }
@@ -2107,7 +2053,7 @@ public Builder clearPartitionOptions() {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 9;
      */
-    public com.google.spanner.v1.PartitionOptions.Builder getPartitionOptionsBuilder() {
+    public PartitionOptions.Builder getPartitionOptionsBuilder() {
 
       onChanged();
       return getPartitionOptionsFieldBuilder().getBuilder();
@@ -2121,12 +2067,12 @@ public com.google.spanner.v1.PartitionOptions.Builder getPartitionOptionsBuilder
      *
      * .google.spanner.v1.PartitionOptions partition_options = 9;
      */
-    public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
+    public PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
       if (partitionOptionsBuilder_ != null) {
         return partitionOptionsBuilder_.getMessageOrBuilder();
       } else {
         return partitionOptions_ == null
-            ? com.google.spanner.v1.PartitionOptions.getDefaultInstance()
+            ? PartitionOptions.getDefaultInstance()
             : partitionOptions_;
       }
     }
@@ -2140,28 +2086,24 @@ public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuil
      * .google.spanner.v1.PartitionOptions partition_options = 9;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.PartitionOptions,
-            com.google.spanner.v1.PartitionOptions.Builder,
-            com.google.spanner.v1.PartitionOptionsOrBuilder>
+            PartitionOptions, PartitionOptions.Builder, PartitionOptionsOrBuilder>
         getPartitionOptionsFieldBuilder() {
       if (partitionOptionsBuilder_ == null) {
         partitionOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.PartitionOptions,
-                com.google.spanner.v1.PartitionOptions.Builder,
-                com.google.spanner.v1.PartitionOptionsOrBuilder>(
+                PartitionOptions, PartitionOptions.Builder, PartitionOptionsOrBuilder>(
                 getPartitionOptions(), getParentForChildren(), isClean());
         partitionOptions_ = null;
       }
       return partitionOptionsBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2171,19 +2113,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.PartitionReadRequest)
-  private static final com.google.spanner.v1.PartitionReadRequest DEFAULT_INSTANCE;
+  private static final PartitionReadRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.PartitionReadRequest();
+    DEFAULT_INSTANCE = new PartitionReadRequest();
   }
 
-  public static com.google.spanner.v1.PartitionReadRequest getDefaultInstance() {
+  public static PartitionReadRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public PartitionReadRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2196,13 +2138,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.PartitionReadRequest getDefaultInstanceForType() {
+  @Override
+  public PartitionReadRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequestOrBuilder.java
index 3b178f7183..c5c4a1f6fb 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return The session.
    */
-  java.lang.String getSession();
+  String getSession();
   /**
    *
    *
@@ -77,7 +77,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return The transaction.
    */
-  com.google.spanner.v1.TransactionSelector getTransaction();
+  TransactionSelector getTransaction();
   /**
    *
    *
@@ -88,7 +88,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * .google.spanner.v1.TransactionSelector transaction = 2;
    */
-  com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder();
+  TransactionSelectorOrBuilder getTransactionOrBuilder();
 
   /**
    *
@@ -101,7 +101,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return The table.
    */
-  java.lang.String getTable();
+  String getTable();
   /**
    *
    *
@@ -128,7 +128,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return The index.
    */
-  java.lang.String getIndex();
+  String getIndex();
   /**
    *
    *
@@ -156,7 +156,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return A list containing the columns.
    */
-  java.util.List getColumnsList();
+  java.util.List getColumnsList();
   /**
    *
    *
@@ -183,7 +183,7 @@ public interface PartitionReadRequestOrBuilder
    * @param index The index of the element to return.
    * @return The columns at the given index.
    */
-  java.lang.String getColumns(int index);
+  String getColumns(int index);
   /**
    *
    *
@@ -232,7 +232,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return The keySet.
    */
-  com.google.spanner.v1.KeySet getKeySet();
+  KeySet getKeySet();
   /**
    *
    *
@@ -247,7 +247,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
    */
-  com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder();
+  KeySetOrBuilder getKeySetOrBuilder();
 
   /**
    *
@@ -272,7 +272,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return The partitionOptions.
    */
-  com.google.spanner.v1.PartitionOptions getPartitionOptions();
+  PartitionOptions getPartitionOptions();
   /**
    *
    *
@@ -282,5 +282,5 @@ public interface PartitionReadRequestOrBuilder
    *
    * .google.spanner.v1.PartitionOptions partition_options = 9;
    */
-  com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuilder();
+  PartitionOptionsOrBuilder getPartitionOptionsOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java
index 7ee074e71c..8ab264b484 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java
@@ -42,13 +42,13 @@ private PartitionResponse() {
     partitions_ = java.util.Collections.emptyList();
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new PartitionResponse();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private PartitionResponse(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -75,21 +75,19 @@ private PartitionResponse(
           case 10:
             {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                partitions_ = new java.util.ArrayList();
+                partitions_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              partitions_.add(
-                  input.readMessage(com.google.spanner.v1.Partition.parser(), extensionRegistry));
+              partitions_.add(input.readMessage(Partition.parser(), extensionRegistry));
               break;
             }
           case 18:
             {
-              com.google.spanner.v1.Transaction.Builder subBuilder = null;
+              Transaction.Builder subBuilder = null;
               if (transaction_ != null) {
                 subBuilder = transaction_.toBuilder();
               }
-              transaction_ =
-                  input.readMessage(com.google.spanner.v1.Transaction.parser(), extensionRegistry);
+              transaction_ = input.readMessage(Transaction.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(transaction_);
                 transaction_ = subBuilder.buildPartial();
@@ -120,22 +118,17 @@ private PartitionResponse(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_PartitionResponse_descriptor;
+    return SpannerProto.internal_static_google_spanner_v1_PartitionResponse_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_PartitionResponse_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.PartitionResponse.class,
-            com.google.spanner.v1.PartitionResponse.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return SpannerProto.internal_static_google_spanner_v1_PartitionResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(PartitionResponse.class, Builder.class);
   }
 
   public static final int PARTITIONS_FIELD_NUMBER = 1;
-  private java.util.List partitions_;
+  private java.util.List partitions_;
   /**
    *
    *
@@ -145,8 +138,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  @java.lang.Override
-  public java.util.List getPartitionsList() {
+  @Override
+  public java.util.List getPartitionsList() {
     return partitions_;
   }
   /**
@@ -158,9 +151,8 @@ public java.util.List getPartitionsList() {
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  @java.lang.Override
-  public java.util.List
-      getPartitionsOrBuilderList() {
+  @Override
+  public java.util.List getPartitionsOrBuilderList() {
     return partitions_;
   }
   /**
@@ -172,7 +164,7 @@ public java.util.List getPartitionsList() {
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  @java.lang.Override
+  @Override
   public int getPartitionsCount() {
     return partitions_.size();
   }
@@ -185,8 +177,8 @@ public int getPartitionsCount() {
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Partition getPartitions(int index) {
+  @Override
+  public Partition getPartitions(int index) {
     return partitions_.get(index);
   }
   /**
@@ -198,13 +190,13 @@ public com.google.spanner.v1.Partition getPartitions(int index) {
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.PartitionOrBuilder getPartitionsOrBuilder(int index) {
+  @Override
+  public PartitionOrBuilder getPartitionsOrBuilder(int index) {
     return partitions_.get(index);
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 2;
-  private com.google.spanner.v1.Transaction transaction_;
+  private Transaction transaction_;
   /**
    *
    *
@@ -216,7 +208,7 @@ public com.google.spanner.v1.PartitionOrBuilder getPartitionsOrBuilder(int index
    *
    * @return Whether the transaction field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasTransaction() {
     return transaction_ != null;
   }
@@ -231,11 +223,9 @@ public boolean hasTransaction() {
    *
    * @return The transaction.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Transaction getTransaction() {
-    return transaction_ == null
-        ? com.google.spanner.v1.Transaction.getDefaultInstance()
-        : transaction_;
+  @Override
+  public Transaction getTransaction() {
+    return transaction_ == null ? Transaction.getDefaultInstance() : transaction_;
   }
   /**
    *
@@ -246,14 +236,14 @@ public com.google.spanner.v1.Transaction getTransaction() {
    *
    * .google.spanner.v1.Transaction transaction = 2;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
+  @Override
+  public TransactionOrBuilder getTransactionOrBuilder() {
     return getTransaction();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -263,7 +253,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < partitions_.size(); i++) {
       output.writeMessage(1, partitions_.get(i));
@@ -274,7 +264,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -291,15 +281,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.PartitionResponse)) {
+    if (!(obj instanceof PartitionResponse)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.PartitionResponse other = (com.google.spanner.v1.PartitionResponse) obj;
+    PartitionResponse other = (PartitionResponse) obj;
 
     if (!getPartitionsList().equals(other.getPartitionsList())) return false;
     if (hasTransaction() != other.hasTransaction()) return false;
@@ -310,7 +300,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -330,71 +320,69 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.PartitionResponse parseFrom(java.nio.ByteBuffer data)
+  public static PartitionResponse parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartitionResponse parseFrom(
+  public static PartitionResponse parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.PartitionResponse parseFrom(
-      com.google.protobuf.ByteString data)
+  public static PartitionResponse parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartitionResponse parseFrom(
+  public static PartitionResponse 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.spanner.v1.PartitionResponse parseFrom(byte[] data)
+  public static PartitionResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PartitionResponse parseFrom(
+  public static PartitionResponse parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.PartitionResponse parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static PartitionResponse parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartitionResponse parseFrom(
+  public static PartitionResponse 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.spanner.v1.PartitionResponse parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
+  public static PartitionResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartitionResponse parseDelimitedFrom(
+  public static PartitionResponse 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.spanner.v1.PartitionResponse parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static PartitionResponse parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PartitionResponse parseFrom(
+  public static PartitionResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -402,7 +390,7 @@ public static com.google.spanner.v1.PartitionResponse parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -411,17 +399,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.PartitionResponse prototype) {
+  public static Builder newBuilder(PartitionResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -438,20 +426,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.PartitionResponse)
-      com.google.spanner.v1.PartitionResponseOrBuilder {
+      PartitionResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_PartitionResponse_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_PartitionResponse_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_PartitionResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.PartitionResponse.class,
-              com.google.spanner.v1.PartitionResponse.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return SpannerProto.internal_static_google_spanner_v1_PartitionResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(PartitionResponse.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.PartitionResponse.newBuilder()
@@ -459,7 +442,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -470,7 +453,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       if (partitionsBuilder_ == null) {
@@ -488,30 +471,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_PartitionResponse_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_PartitionResponse_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartitionResponse getDefaultInstanceForType() {
-      return com.google.spanner.v1.PartitionResponse.getDefaultInstance();
+    @Override
+    public PartitionResponse getDefaultInstanceForType() {
+      return PartitionResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartitionResponse build() {
-      com.google.spanner.v1.PartitionResponse result = buildPartial();
+    @Override
+    public PartitionResponse build() {
+      PartitionResponse result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PartitionResponse buildPartial() {
-      com.google.spanner.v1.PartitionResponse result =
-          new com.google.spanner.v1.PartitionResponse(this);
+    @Override
+    public PartitionResponse buildPartial() {
+      PartitionResponse result = new PartitionResponse(this);
       int from_bitField0_ = bitField0_;
       if (partitionsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -531,51 +512,50 @@ public com.google.spanner.v1.PartitionResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.PartitionResponse) {
-        return mergeFrom((com.google.spanner.v1.PartitionResponse) other);
+      if (other instanceof PartitionResponse) {
+        return mergeFrom((PartitionResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.PartitionResponse other) {
-      if (other == com.google.spanner.v1.PartitionResponse.getDefaultInstance()) return this;
+    public Builder mergeFrom(PartitionResponse other) {
+      if (other == PartitionResponse.getDefaultInstance()) return this;
       if (partitionsBuilder_ == null) {
         if (!other.partitions_.isEmpty()) {
           if (partitions_.isEmpty()) {
@@ -611,21 +591,21 @@ public Builder mergeFrom(com.google.spanner.v1.PartitionResponse other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.PartitionResponse parsedMessage = null;
+      PartitionResponse parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.PartitionResponse) e.getUnfinishedMessage();
+        parsedMessage = (PartitionResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -637,20 +617,17 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.util.List partitions_ =
-        java.util.Collections.emptyList();
+    private java.util.List partitions_ = java.util.Collections.emptyList();
 
     private void ensurePartitionsIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        partitions_ = new java.util.ArrayList(partitions_);
+        partitions_ = new java.util.ArrayList(partitions_);
         bitField0_ |= 0x00000001;
       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.Partition,
-            com.google.spanner.v1.Partition.Builder,
-            com.google.spanner.v1.PartitionOrBuilder>
+            Partition, Partition.Builder, PartitionOrBuilder>
         partitionsBuilder_;
 
     /**
@@ -662,7 +639,7 @@ private void ensurePartitionsIsMutable() {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public java.util.List getPartitionsList() {
+    public java.util.List getPartitionsList() {
       if (partitionsBuilder_ == null) {
         return java.util.Collections.unmodifiableList(partitions_);
       } else {
@@ -694,7 +671,7 @@ public int getPartitionsCount() {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public com.google.spanner.v1.Partition getPartitions(int index) {
+    public Partition getPartitions(int index) {
       if (partitionsBuilder_ == null) {
         return partitions_.get(index);
       } else {
@@ -710,7 +687,7 @@ public com.google.spanner.v1.Partition getPartitions(int index) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder setPartitions(int index, com.google.spanner.v1.Partition value) {
+    public Builder setPartitions(int index, Partition value) {
       if (partitionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -732,8 +709,7 @@ public Builder setPartitions(int index, com.google.spanner.v1.Partition value) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder setPartitions(
-        int index, com.google.spanner.v1.Partition.Builder builderForValue) {
+    public Builder setPartitions(int index, Partition.Builder builderForValue) {
       if (partitionsBuilder_ == null) {
         ensurePartitionsIsMutable();
         partitions_.set(index, builderForValue.build());
@@ -752,7 +728,7 @@ public Builder setPartitions(
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder addPartitions(com.google.spanner.v1.Partition value) {
+    public Builder addPartitions(Partition value) {
       if (partitionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -774,7 +750,7 @@ public Builder addPartitions(com.google.spanner.v1.Partition value) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder addPartitions(int index, com.google.spanner.v1.Partition value) {
+    public Builder addPartitions(int index, Partition value) {
       if (partitionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -796,7 +772,7 @@ public Builder addPartitions(int index, com.google.spanner.v1.Partition value) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder addPartitions(com.google.spanner.v1.Partition.Builder builderForValue) {
+    public Builder addPartitions(Partition.Builder builderForValue) {
       if (partitionsBuilder_ == null) {
         ensurePartitionsIsMutable();
         partitions_.add(builderForValue.build());
@@ -815,8 +791,7 @@ public Builder addPartitions(com.google.spanner.v1.Partition.Builder builderForV
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder addPartitions(
-        int index, com.google.spanner.v1.Partition.Builder builderForValue) {
+    public Builder addPartitions(int index, Partition.Builder builderForValue) {
       if (partitionsBuilder_ == null) {
         ensurePartitionsIsMutable();
         partitions_.add(index, builderForValue.build());
@@ -835,8 +810,7 @@ public Builder addPartitions(
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder addAllPartitions(
-        java.lang.Iterable values) {
+    public Builder addAllPartitions(Iterable values) {
       if (partitionsBuilder_ == null) {
         ensurePartitionsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, partitions_);
@@ -893,7 +867,7 @@ public Builder removePartitions(int index) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public com.google.spanner.v1.Partition.Builder getPartitionsBuilder(int index) {
+    public Partition.Builder getPartitionsBuilder(int index) {
       return getPartitionsFieldBuilder().getBuilder(index);
     }
     /**
@@ -905,7 +879,7 @@ public com.google.spanner.v1.Partition.Builder getPartitionsBuilder(int index) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public com.google.spanner.v1.PartitionOrBuilder getPartitionsOrBuilder(int index) {
+    public PartitionOrBuilder getPartitionsOrBuilder(int index) {
       if (partitionsBuilder_ == null) {
         return partitions_.get(index);
       } else {
@@ -921,8 +895,7 @@ public com.google.spanner.v1.PartitionOrBuilder getPartitionsOrBuilder(int index
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public java.util.List
-        getPartitionsOrBuilderList() {
+    public java.util.List getPartitionsOrBuilderList() {
       if (partitionsBuilder_ != null) {
         return partitionsBuilder_.getMessageOrBuilderList();
       } else {
@@ -938,9 +911,8 @@ public com.google.spanner.v1.PartitionOrBuilder getPartitionsOrBuilder(int index
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public com.google.spanner.v1.Partition.Builder addPartitionsBuilder() {
-      return getPartitionsFieldBuilder()
-          .addBuilder(com.google.spanner.v1.Partition.getDefaultInstance());
+    public Partition.Builder addPartitionsBuilder() {
+      return getPartitionsFieldBuilder().addBuilder(Partition.getDefaultInstance());
     }
     /**
      *
@@ -951,9 +923,8 @@ public com.google.spanner.v1.Partition.Builder addPartitionsBuilder() {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public com.google.spanner.v1.Partition.Builder addPartitionsBuilder(int index) {
-      return getPartitionsFieldBuilder()
-          .addBuilder(index, com.google.spanner.v1.Partition.getDefaultInstance());
+    public Partition.Builder addPartitionsBuilder(int index) {
+      return getPartitionsFieldBuilder().addBuilder(index, Partition.getDefaultInstance());
     }
     /**
      *
@@ -964,32 +935,26 @@ public com.google.spanner.v1.Partition.Builder addPartitionsBuilder(int index) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public java.util.List getPartitionsBuilderList() {
+    public java.util.List getPartitionsBuilderList() {
       return getPartitionsFieldBuilder().getBuilderList();
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.Partition,
-            com.google.spanner.v1.Partition.Builder,
-            com.google.spanner.v1.PartitionOrBuilder>
+            Partition, Partition.Builder, PartitionOrBuilder>
         getPartitionsFieldBuilder() {
       if (partitionsBuilder_ == null) {
         partitionsBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.spanner.v1.Partition,
-                com.google.spanner.v1.Partition.Builder,
-                com.google.spanner.v1.PartitionOrBuilder>(
+                Partition, Partition.Builder, PartitionOrBuilder>(
                 partitions_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         partitions_ = null;
       }
       return partitionsBuilder_;
     }
 
-    private com.google.spanner.v1.Transaction transaction_;
+    private Transaction transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Transaction,
-            com.google.spanner.v1.Transaction.Builder,
-            com.google.spanner.v1.TransactionOrBuilder>
+            Transaction, Transaction.Builder, TransactionOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -1016,11 +981,9 @@ public boolean hasTransaction() {
      *
      * @return The transaction.
      */
-    public com.google.spanner.v1.Transaction getTransaction() {
+    public Transaction getTransaction() {
       if (transactionBuilder_ == null) {
-        return transaction_ == null
-            ? com.google.spanner.v1.Transaction.getDefaultInstance()
-            : transaction_;
+        return transaction_ == null ? Transaction.getDefaultInstance() : transaction_;
       } else {
         return transactionBuilder_.getMessage();
       }
@@ -1034,7 +997,7 @@ public com.google.spanner.v1.Transaction getTransaction() {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Builder setTransaction(com.google.spanner.v1.Transaction value) {
+    public Builder setTransaction(Transaction value) {
       if (transactionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1056,7 +1019,7 @@ public Builder setTransaction(com.google.spanner.v1.Transaction value) {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Builder setTransaction(com.google.spanner.v1.Transaction.Builder builderForValue) {
+    public Builder setTransaction(Transaction.Builder builderForValue) {
       if (transactionBuilder_ == null) {
         transaction_ = builderForValue.build();
         onChanged();
@@ -1075,13 +1038,10 @@ public Builder setTransaction(com.google.spanner.v1.Transaction.Builder builderF
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Builder mergeTransaction(com.google.spanner.v1.Transaction value) {
+    public Builder mergeTransaction(Transaction value) {
       if (transactionBuilder_ == null) {
         if (transaction_ != null) {
-          transaction_ =
-              com.google.spanner.v1.Transaction.newBuilder(transaction_)
-                  .mergeFrom(value)
-                  .buildPartial();
+          transaction_ = Transaction.newBuilder(transaction_).mergeFrom(value).buildPartial();
         } else {
           transaction_ = value;
         }
@@ -1121,7 +1081,7 @@ public Builder clearTransaction() {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public com.google.spanner.v1.Transaction.Builder getTransactionBuilder() {
+    public Transaction.Builder getTransactionBuilder() {
 
       onChanged();
       return getTransactionFieldBuilder().getBuilder();
@@ -1135,13 +1095,11 @@ public com.google.spanner.v1.Transaction.Builder getTransactionBuilder() {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
+    public TransactionOrBuilder getTransactionOrBuilder() {
       if (transactionBuilder_ != null) {
         return transactionBuilder_.getMessageOrBuilder();
       } else {
-        return transaction_ == null
-            ? com.google.spanner.v1.Transaction.getDefaultInstance()
-            : transaction_;
+        return transaction_ == null ? Transaction.getDefaultInstance() : transaction_;
       }
     }
     /**
@@ -1154,28 +1112,24 @@ public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
      * .google.spanner.v1.Transaction transaction = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Transaction,
-            com.google.spanner.v1.Transaction.Builder,
-            com.google.spanner.v1.TransactionOrBuilder>
+            Transaction, Transaction.Builder, TransactionOrBuilder>
         getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.Transaction,
-                com.google.spanner.v1.Transaction.Builder,
-                com.google.spanner.v1.TransactionOrBuilder>(
+                Transaction, Transaction.Builder, TransactionOrBuilder>(
                 getTransaction(), getParentForChildren(), isClean());
         transaction_ = null;
       }
       return transactionBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1185,19 +1139,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.PartitionResponse)
-  private static final com.google.spanner.v1.PartitionResponse DEFAULT_INSTANCE;
+  private static final PartitionResponse DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.PartitionResponse();
+    DEFAULT_INSTANCE = new PartitionResponse();
   }
 
-  public static com.google.spanner.v1.PartitionResponse getDefaultInstance() {
+  public static PartitionResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public PartitionResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1210,13 +1164,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.PartitionResponse getDefaultInstanceForType() {
+  @Override
+  public PartitionResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponseOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponseOrBuilder.java
index 0015b84f03..6a7cea77cc 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponseOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponseOrBuilder.java
@@ -32,7 +32,7 @@ public interface PartitionResponseOrBuilder
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  java.util.List getPartitionsList();
+  java.util.List getPartitionsList();
   /**
    *
    *
@@ -42,7 +42,7 @@ public interface PartitionResponseOrBuilder
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  com.google.spanner.v1.Partition getPartitions(int index);
+  Partition getPartitions(int index);
   /**
    *
    *
@@ -62,7 +62,7 @@ public interface PartitionResponseOrBuilder
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  java.util.List getPartitionsOrBuilderList();
+  java.util.List getPartitionsOrBuilderList();
   /**
    *
    *
@@ -72,7 +72,7 @@ public interface PartitionResponseOrBuilder
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  com.google.spanner.v1.PartitionOrBuilder getPartitionsOrBuilder(int index);
+  PartitionOrBuilder getPartitionsOrBuilder(int index);
 
   /**
    *
@@ -97,7 +97,7 @@ public interface PartitionResponseOrBuilder
    *
    * @return The transaction.
    */
-  com.google.spanner.v1.Transaction getTransaction();
+  Transaction getTransaction();
   /**
    *
    *
@@ -107,5 +107,5 @@ public interface PartitionResponseOrBuilder
    *
    * .google.spanner.v1.Transaction transaction = 2;
    */
-  com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder();
+  TransactionOrBuilder getTransactionOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java
index ce3920eccb..a8b7282a81 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java
@@ -43,13 +43,13 @@ private PlanNode() {
     childLinks_ = java.util.Collections.emptyList();
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new PlanNode();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -60,7 +60,7 @@ private PlanNode(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -87,7 +87,7 @@ private PlanNode(
             }
           case 26:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               displayName_ = s;
               break;
@@ -95,24 +95,20 @@ private PlanNode(
           case 34:
             {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                childLinks_ = new java.util.ArrayList();
+                childLinks_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              childLinks_.add(
-                  input.readMessage(
-                      com.google.spanner.v1.PlanNode.ChildLink.parser(), extensionRegistry));
+              childLinks_.add(input.readMessage(ChildLink.parser(), extensionRegistry));
               break;
             }
           case 42:
             {
-              com.google.spanner.v1.PlanNode.ShortRepresentation.Builder subBuilder = null;
+              ShortRepresentation.Builder subBuilder = null;
               if (shortRepresentation_ != null) {
                 subBuilder = shortRepresentation_.toBuilder();
               }
               shortRepresentation_ =
-                  input.readMessage(
-                      com.google.spanner.v1.PlanNode.ShortRepresentation.parser(),
-                      extensionRegistry);
+                  input.readMessage(ShortRepresentation.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(shortRepresentation_);
                 shortRepresentation_ = subBuilder.buildPartial();
@@ -172,17 +168,13 @@ private PlanNode(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.QueryPlanProto
-        .internal_static_google_spanner_v1_PlanNode_descriptor;
+    return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.QueryPlanProto
-        .internal_static_google_spanner_v1_PlanNode_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.PlanNode.class, com.google.spanner.v1.PlanNode.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(PlanNode.class, Builder.class);
   }
 
   /**
@@ -272,8 +264,7 @@ public enum Kind implements com.google.protobuf.ProtocolMessageEnum {
 
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
+        throw new IllegalArgumentException("Can't get the number of an unknown enum value.");
       }
       return value;
     }
@@ -283,7 +274,7 @@ public final int getNumber() {
      * @return The enum associated with the given numeric wire value.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @java.lang.Deprecated
+    @Deprecated
     public static Kind valueOf(int value) {
       return forNumber(value);
     }
@@ -318,8 +309,7 @@ public Kind findValueByNumber(int number) {
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
       if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalStateException(
-            "Can't get the descriptor of an unrecognized enum value.");
+        throw new IllegalStateException("Can't get the descriptor of an unrecognized enum value.");
       }
       return getDescriptor().getValues().get(ordinal());
     }
@@ -329,14 +319,14 @@ public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType
     }
 
     public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-      return com.google.spanner.v1.PlanNode.getDescriptor().getEnumTypes().get(0);
+      return PlanNode.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final Kind[] VALUES = values();
 
     public static Kind valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+        throw new IllegalArgumentException("EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -385,7 +375,7 @@ public interface ChildLinkOrBuilder
      *
      * @return The type.
      */
-    java.lang.String getType();
+    String getType();
     /**
      *
      *
@@ -420,7 +410,7 @@ public interface ChildLinkOrBuilder
      *
      * @return The variable.
      */
-    java.lang.String getVariable();
+    String getVariable();
     /**
      *
      *
@@ -466,13 +456,13 @@ private ChildLink() {
       variable_ = "";
     }
 
-    @java.lang.Override
+    @Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected Object newInstance(UnusedPrivateParameter unused) {
       return new ChildLink();
     }
 
-    @java.lang.Override
+    @Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -483,7 +473,7 @@ private ChildLink(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -502,14 +492,14 @@ private ChildLink(
               }
             case 18:
               {
-                java.lang.String s = input.readStringRequireUtf8();
+                String s = input.readStringRequireUtf8();
 
                 type_ = s;
                 break;
               }
             case 26:
               {
-                java.lang.String s = input.readStringRequireUtf8();
+                String s = input.readStringRequireUtf8();
 
                 variable_ = s;
                 break;
@@ -534,18 +524,13 @@ private ChildLink(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.QueryPlanProto
-          .internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
+      return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.QueryPlanProto
-          .internal_static_google_spanner_v1_PlanNode_ChildLink_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.PlanNode.ChildLink.class,
-              com.google.spanner.v1.PlanNode.ChildLink.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ChildLink_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(ChildLink.class, Builder.class);
     }
 
     public static final int CHILD_INDEX_FIELD_NUMBER = 1;
@@ -561,13 +546,13 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      *
      * @return The childIndex.
      */
-    @java.lang.Override
+    @Override
     public int getChildIndex() {
       return childIndex_;
     }
 
     public static final int TYPE_FIELD_NUMBER = 2;
-    private volatile java.lang.Object type_;
+    private volatile Object type_;
     /**
      *
      *
@@ -582,14 +567,14 @@ public int getChildIndex() {
      *
      * @return The type.
      */
-    @java.lang.Override
-    public java.lang.String getType() {
-      java.lang.Object ref = type_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
+    @Override
+    public String getType() {
+      Object ref = type_;
+      if (ref instanceof String) {
+        return (String) ref;
       } else {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         type_ = s;
         return s;
       }
@@ -608,12 +593,12 @@ public java.lang.String getType() {
      *
      * @return The bytes for type.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ByteString getTypeBytes() {
-      java.lang.Object ref = type_;
-      if (ref instanceof java.lang.String) {
+      Object ref = type_;
+      if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         type_ = b;
         return b;
       } else {
@@ -622,7 +607,7 @@ public com.google.protobuf.ByteString getTypeBytes() {
     }
 
     public static final int VARIABLE_FIELD_NUMBER = 3;
-    private volatile java.lang.Object variable_;
+    private volatile Object variable_;
     /**
      *
      *
@@ -641,14 +626,14 @@ public com.google.protobuf.ByteString getTypeBytes() {
      *
      * @return The variable.
      */
-    @java.lang.Override
-    public java.lang.String getVariable() {
-      java.lang.Object ref = variable_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
+    @Override
+    public String getVariable() {
+      Object ref = variable_;
+      if (ref instanceof String) {
+        return (String) ref;
       } else {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         variable_ = s;
         return s;
       }
@@ -671,12 +656,12 @@ public java.lang.String getVariable() {
      *
      * @return The bytes for variable.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ByteString getVariableBytes() {
-      java.lang.Object ref = variable_;
-      if (ref instanceof java.lang.String) {
+      Object ref = variable_;
+      if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         variable_ = b;
         return b;
       } else {
@@ -686,7 +671,7 @@ public com.google.protobuf.ByteString getVariableBytes() {
 
     private byte memoizedIsInitialized = -1;
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -696,7 +681,7 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (childIndex_ != 0) {
         output.writeInt32(1, childIndex_);
@@ -710,7 +695,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
+    @Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -730,16 +715,15 @@ public int getSerializedSize() {
       return size;
     }
 
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
+    @Override
+    public boolean equals(final Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof com.google.spanner.v1.PlanNode.ChildLink)) {
+      if (!(obj instanceof ChildLink)) {
         return super.equals(obj);
       }
-      com.google.spanner.v1.PlanNode.ChildLink other =
-          (com.google.spanner.v1.PlanNode.ChildLink) obj;
+      ChildLink other = (ChildLink) obj;
 
       if (getChildIndex() != other.getChildIndex()) return false;
       if (!getType().equals(other.getType())) return false;
@@ -748,7 +732,7 @@ public boolean equals(final java.lang.Object obj) {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -766,71 +750,69 @@ public int hashCode() {
       return hash;
     }
 
-    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(java.nio.ByteBuffer data)
+    public static ChildLink parseFrom(java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
+    public static ChildLink parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
-        com.google.protobuf.ByteString data)
+    public static ChildLink parseFrom(com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
+    public static ChildLink 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.spanner.v1.PlanNode.ChildLink parseFrom(byte[] data)
+    public static ChildLink parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
+    public static ChildLink parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
+    public static ChildLink parseFrom(java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
+    public static ChildLink 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.spanner.v1.PlanNode.ChildLink parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
+    public static ChildLink parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.PlanNode.ChildLink parseDelimitedFrom(
+    public static ChildLink 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.spanner.v1.PlanNode.ChildLink parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    public static ChildLink parseFrom(com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
+    public static ChildLink parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -838,7 +820,7 @@ public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
+    @Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -847,18 +829,17 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(com.google.spanner.v1.PlanNode.ChildLink prototype) {
+    public static Builder newBuilder(ChildLink prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @java.lang.Override
+    @Override
     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) {
+    @Override
+    protected Builder newBuilderForType(BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -876,20 +857,16 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.PlanNode.ChildLink)
-        com.google.spanner.v1.PlanNode.ChildLinkOrBuilder {
+        ChildLinkOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return com.google.spanner.v1.QueryPlanProto
-            .internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
+        return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
       }
 
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.spanner.v1.QueryPlanProto
+      @Override
+      protected FieldAccessorTable internalGetFieldAccessorTable() {
+        return QueryPlanProto
             .internal_static_google_spanner_v1_PlanNode_ChildLink_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.spanner.v1.PlanNode.ChildLink.class,
-                com.google.spanner.v1.PlanNode.ChildLink.Builder.class);
+            .ensureFieldAccessorsInitialized(ChildLink.class, Builder.class);
       }
 
       // Construct using com.google.spanner.v1.PlanNode.ChildLink.newBuilder()
@@ -897,7 +874,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -906,7 +883,7 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @java.lang.Override
+      @Override
       public Builder clear() {
         super.clear();
         childIndex_ = 0;
@@ -918,30 +895,28 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return com.google.spanner.v1.QueryPlanProto
-            .internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
+        return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.PlanNode.ChildLink getDefaultInstanceForType() {
-        return com.google.spanner.v1.PlanNode.ChildLink.getDefaultInstance();
+      @Override
+      public ChildLink getDefaultInstanceForType() {
+        return ChildLink.getDefaultInstance();
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.PlanNode.ChildLink build() {
-        com.google.spanner.v1.PlanNode.ChildLink result = buildPartial();
+      @Override
+      public ChildLink build() {
+        ChildLink result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.PlanNode.ChildLink buildPartial() {
-        com.google.spanner.v1.PlanNode.ChildLink result =
-            new com.google.spanner.v1.PlanNode.ChildLink(this);
+      @Override
+      public ChildLink buildPartial() {
+        ChildLink result = new ChildLink(this);
         result.childIndex_ = childIndex_;
         result.type_ = type_;
         result.variable_ = variable_;
@@ -949,53 +924,50 @@ public com.google.spanner.v1.PlanNode.ChildLink buildPartial() {
         return result;
       }
 
-      @java.lang.Override
+      @Override
       public Builder clone() {
         return super.clone();
       }
 
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      @Override
+      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.setField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @java.lang.Override
+      @Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.spanner.v1.PlanNode.ChildLink) {
-          return mergeFrom((com.google.spanner.v1.PlanNode.ChildLink) other);
+        if (other instanceof ChildLink) {
+          return mergeFrom((ChildLink) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.google.spanner.v1.PlanNode.ChildLink other) {
-        if (other == com.google.spanner.v1.PlanNode.ChildLink.getDefaultInstance()) return this;
+      public Builder mergeFrom(ChildLink other) {
+        if (other == ChildLink.getDefaultInstance()) return this;
         if (other.getChildIndex() != 0) {
           setChildIndex(other.getChildIndex());
         }
@@ -1012,21 +984,21 @@ public Builder mergeFrom(com.google.spanner.v1.PlanNode.ChildLink other) {
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.spanner.v1.PlanNode.ChildLink parsedMessage = null;
+        ChildLink parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.spanner.v1.PlanNode.ChildLink) e.getUnfinishedMessage();
+          parsedMessage = (ChildLink) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1048,7 +1020,7 @@ public Builder mergeFrom(
        *
        * @return The childIndex.
        */
-      @java.lang.Override
+      @Override
       public int getChildIndex() {
         return childIndex_;
       }
@@ -1088,7 +1060,7 @@ public Builder clearChildIndex() {
         return this;
       }
 
-      private java.lang.Object type_ = "";
+      private Object type_ = "";
       /**
        *
        *
@@ -1103,15 +1075,15 @@ public Builder clearChildIndex() {
        *
        * @return The type.
        */
-      public java.lang.String getType() {
-        java.lang.Object ref = type_;
-        if (!(ref instanceof java.lang.String)) {
+      public String getType() {
+        Object ref = type_;
+        if (!(ref instanceof String)) {
           com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
+          String s = bs.toStringUtf8();
           type_ = s;
           return s;
         } else {
-          return (java.lang.String) ref;
+          return (String) ref;
         }
       }
       /**
@@ -1129,10 +1101,10 @@ public java.lang.String getType() {
        * @return The bytes for type.
        */
       public com.google.protobuf.ByteString getTypeBytes() {
-        java.lang.Object ref = type_;
+        Object ref = type_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+              com.google.protobuf.ByteString.copyFromUtf8((String) ref);
           type_ = b;
           return b;
         } else {
@@ -1154,7 +1126,7 @@ public com.google.protobuf.ByteString getTypeBytes() {
        * @param value The type to set.
        * @return This builder for chaining.
        */
-      public Builder setType(java.lang.String value) {
+      public Builder setType(String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1209,7 +1181,7 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private java.lang.Object variable_ = "";
+      private Object variable_ = "";
       /**
        *
        *
@@ -1228,15 +1200,15 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
        *
        * @return The variable.
        */
-      public java.lang.String getVariable() {
-        java.lang.Object ref = variable_;
-        if (!(ref instanceof java.lang.String)) {
+      public String getVariable() {
+        Object ref = variable_;
+        if (!(ref instanceof String)) {
           com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
+          String s = bs.toStringUtf8();
           variable_ = s;
           return s;
         } else {
-          return (java.lang.String) ref;
+          return (String) ref;
         }
       }
       /**
@@ -1258,10 +1230,10 @@ public java.lang.String getVariable() {
        * @return The bytes for variable.
        */
       public com.google.protobuf.ByteString getVariableBytes() {
-        java.lang.Object ref = variable_;
+        Object ref = variable_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+              com.google.protobuf.ByteString.copyFromUtf8((String) ref);
           variable_ = b;
           return b;
         } else {
@@ -1287,7 +1259,7 @@ public com.google.protobuf.ByteString getVariableBytes() {
        * @param value The variable to set.
        * @return This builder for chaining.
        */
-      public Builder setVariable(java.lang.String value) {
+      public Builder setVariable(String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1350,13 +1322,13 @@ public Builder setVariableBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @java.lang.Override
+      @Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1366,19 +1338,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.PlanNode.ChildLink)
-    private static final com.google.spanner.v1.PlanNode.ChildLink DEFAULT_INSTANCE;
+    private static final ChildLink DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new com.google.spanner.v1.PlanNode.ChildLink();
+      DEFAULT_INSTANCE = new ChildLink();
     }
 
-    public static com.google.spanner.v1.PlanNode.ChildLink getDefaultInstance() {
+    public static ChildLink getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @java.lang.Override
+          @Override
           public ChildLink parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1391,13 +1363,13 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PlanNode.ChildLink getDefaultInstanceForType() {
+    @Override
+    public ChildLink getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
@@ -1418,7 +1390,7 @@ public interface ShortRepresentationOrBuilder
      *
      * @return The description.
      */
-    java.lang.String getDescription();
+    String getDescription();
     /**
      *
      *
@@ -1459,10 +1431,10 @@ public interface ShortRepresentationOrBuilder
      *
      * map<string, int32> subqueries = 2;
      */
-    boolean containsSubqueries(java.lang.String key);
+    boolean containsSubqueries(String key);
     /** Use {@link #getSubqueriesMap()} instead. */
-    @java.lang.Deprecated
-    java.util.Map getSubqueries();
+    @Deprecated
+    java.util.Map getSubqueries();
     /**
      *
      *
@@ -1476,7 +1448,7 @@ public interface ShortRepresentationOrBuilder
      *
      * map<string, int32> subqueries = 2;
      */
-    java.util.Map getSubqueriesMap();
+    java.util.Map getSubqueriesMap();
     /**
      *
      *
@@ -1490,7 +1462,7 @@ public interface ShortRepresentationOrBuilder
      *
      * map<string, int32> subqueries = 2;
      */
-    int getSubqueriesOrDefault(java.lang.String key, int defaultValue);
+    int getSubqueriesOrDefault(String key, int defaultValue);
     /**
      *
      *
@@ -1504,7 +1476,7 @@ public interface ShortRepresentationOrBuilder
      *
      * map<string, int32> subqueries = 2;
      */
-    int getSubqueriesOrThrow(java.lang.String key);
+    int getSubqueriesOrThrow(String key);
   }
   /**
    *
@@ -1530,13 +1502,13 @@ private ShortRepresentation() {
       description_ = "";
     }
 
-    @java.lang.Override
+    @Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected Object newInstance(UnusedPrivateParameter unused) {
       return new ShortRepresentation();
     }
 
-    @java.lang.Override
+    @Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -1547,7 +1519,7 @@ private ShortRepresentation(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -1562,7 +1534,7 @@ private ShortRepresentation(
               break;
             case 10:
               {
-                java.lang.String s = input.readStringRequireUtf8();
+                String s = input.readStringRequireUtf8();
 
                 description_ = s;
                 break;
@@ -1575,7 +1547,7 @@ private ShortRepresentation(
                           SubqueriesDefaultEntryHolder.defaultEntry);
                   mutable_bitField0_ |= 0x00000001;
                 }
-                com.google.protobuf.MapEntry subqueries__ =
+                com.google.protobuf.MapEntry subqueries__ =
                     input.readMessage(
                         SubqueriesDefaultEntryHolder.defaultEntry.getParserForType(),
                         extensionRegistry);
@@ -1602,12 +1574,12 @@ private ShortRepresentation(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.QueryPlanProto
+      return QueryPlanProto
           .internal_static_google_spanner_v1_PlanNode_ShortRepresentation_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
-    @java.lang.Override
+    @Override
     protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 2:
@@ -1617,18 +1589,15 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
       }
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.QueryPlanProto
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return QueryPlanProto
           .internal_static_google_spanner_v1_PlanNode_ShortRepresentation_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.PlanNode.ShortRepresentation.class,
-              com.google.spanner.v1.PlanNode.ShortRepresentation.Builder.class);
+          .ensureFieldAccessorsInitialized(ShortRepresentation.class, Builder.class);
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 1;
-    private volatile java.lang.Object description_;
+    private volatile Object description_;
     /**
      *
      *
@@ -1640,14 +1609,14 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
      *
      * @return The description.
      */
-    @java.lang.Override
-    public java.lang.String getDescription() {
-      java.lang.Object ref = description_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
+    @Override
+    public String getDescription() {
+      Object ref = description_;
+      if (ref instanceof String) {
+        return (String) ref;
       } else {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         description_ = s;
         return s;
       }
@@ -1663,12 +1632,12 @@ public java.lang.String getDescription() {
      *
      * @return The bytes for description.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ByteString getDescriptionBytes() {
-      java.lang.Object ref = description_;
-      if (ref instanceof java.lang.String) {
+      Object ref = description_;
+      if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         description_ = b;
         return b;
       } else {
@@ -1679,9 +1648,9 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
     public static final int SUBQUERIES_FIELD_NUMBER = 2;
 
     private static final class SubqueriesDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry defaultEntry =
-          com.google.protobuf.MapEntry.newDefaultInstance(
-              com.google.spanner.v1.QueryPlanProto
+      static final com.google.protobuf.MapEntry defaultEntry =
+          com.google.protobuf.MapEntry.newDefaultInstance(
+              QueryPlanProto
                   .internal_static_google_spanner_v1_PlanNode_ShortRepresentation_SubqueriesEntry_descriptor,
               com.google.protobuf.WireFormat.FieldType.STRING,
               "",
@@ -1689,10 +1658,9 @@ private static final class SubqueriesDefaultEntryHolder {
               0);
     }
 
-    private com.google.protobuf.MapField subqueries_;
+    private com.google.protobuf.MapField subqueries_;
 
-    private com.google.protobuf.MapField
-        internalGetSubqueries() {
+    private com.google.protobuf.MapField internalGetSubqueries() {
       if (subqueries_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             SubqueriesDefaultEntryHolder.defaultEntry);
@@ -1716,17 +1684,17 @@ public int getSubqueriesCount() {
      *
      * map<string, int32> subqueries = 2;
      */
-    @java.lang.Override
-    public boolean containsSubqueries(java.lang.String key) {
+    @Override
+    public boolean containsSubqueries(String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       return internalGetSubqueries().getMap().containsKey(key);
     }
     /** Use {@link #getSubqueriesMap()} instead. */
-    @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map getSubqueries() {
+    @Override
+    @Deprecated
+    public java.util.Map getSubqueries() {
       return getSubqueriesMap();
     }
     /**
@@ -1742,8 +1710,8 @@ public java.util.Map getSubqueries() {
      *
      * map<string, int32> subqueries = 2;
      */
-    @java.lang.Override
-    public java.util.Map getSubqueriesMap() {
+    @Override
+    public java.util.Map getSubqueriesMap() {
       return internalGetSubqueries().getMap();
     }
     /**
@@ -1759,12 +1727,12 @@ public java.util.Map getSubqueriesMap() {
      *
      * map<string, int32> subqueries = 2;
      */
-    @java.lang.Override
-    public int getSubqueriesOrDefault(java.lang.String key, int defaultValue) {
+    @Override
+    public int getSubqueriesOrDefault(String key, int defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
-      java.util.Map map = internalGetSubqueries().getMap();
+      java.util.Map map = internalGetSubqueries().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
@@ -1780,21 +1748,21 @@ public int getSubqueriesOrDefault(java.lang.String key, int defaultValue) {
      *
      * map<string, int32> subqueries = 2;
      */
-    @java.lang.Override
-    public int getSubqueriesOrThrow(java.lang.String key) {
+    @Override
+    public int getSubqueriesOrThrow(String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
-      java.util.Map map = internalGetSubqueries().getMap();
+      java.util.Map map = internalGetSubqueries().getMap();
       if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
+        throw new IllegalArgumentException();
       }
       return map.get(key);
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1804,7 +1772,7 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (!getDescriptionBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, description_);
@@ -1814,7 +1782,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
+    @Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1823,9 +1791,9 @@ public int getSerializedSize() {
       if (!getDescriptionBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, description_);
       }
-      for (java.util.Map.Entry entry :
+      for (java.util.Map.Entry entry :
           internalGetSubqueries().getMap().entrySet()) {
-        com.google.protobuf.MapEntry subqueries__ =
+        com.google.protobuf.MapEntry subqueries__ =
             SubqueriesDefaultEntryHolder.defaultEntry
                 .newBuilderForType()
                 .setKey(entry.getKey())
@@ -1838,16 +1806,15 @@ public int getSerializedSize() {
       return size;
     }
 
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
+    @Override
+    public boolean equals(final Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof com.google.spanner.v1.PlanNode.ShortRepresentation)) {
+      if (!(obj instanceof ShortRepresentation)) {
         return super.equals(obj);
       }
-      com.google.spanner.v1.PlanNode.ShortRepresentation other =
-          (com.google.spanner.v1.PlanNode.ShortRepresentation) obj;
+      ShortRepresentation other = (ShortRepresentation) obj;
 
       if (!getDescription().equals(other.getDescription())) return false;
       if (!internalGetSubqueries().equals(other.internalGetSubqueries())) return false;
@@ -1855,7 +1822,7 @@ public boolean equals(final java.lang.Object obj) {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -1873,71 +1840,70 @@ public int hashCode() {
       return hash;
     }
 
-    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static ShortRepresentation parseFrom(java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
+    public static ShortRepresentation parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
-        com.google.protobuf.ByteString data)
+    public static ShortRepresentation parseFrom(com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
+    public static ShortRepresentation 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.spanner.v1.PlanNode.ShortRepresentation parseFrom(byte[] data)
+    public static ShortRepresentation parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
+    public static ShortRepresentation parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
+    public static ShortRepresentation parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
+    public static ShortRepresentation 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.spanner.v1.PlanNode.ShortRepresentation parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
+    public static ShortRepresentation parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseDelimitedFrom(
+    public static ShortRepresentation 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.spanner.v1.PlanNode.ShortRepresentation parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    public static ShortRepresentation parseFrom(com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
+    public static ShortRepresentation parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1945,7 +1911,7 @@ public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
+    @Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -1954,18 +1920,17 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(com.google.spanner.v1.PlanNode.ShortRepresentation prototype) {
+    public static Builder newBuilder(ShortRepresentation prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @java.lang.Override
+    @Override
     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) {
+    @Override
+    protected Builder newBuilderForType(BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1983,9 +1948,9 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.PlanNode.ShortRepresentation)
-        com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder {
+        ShortRepresentationOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return com.google.spanner.v1.QueryPlanProto
+        return QueryPlanProto
             .internal_static_google_spanner_v1_PlanNode_ShortRepresentation_descriptor;
       }
 
@@ -2009,14 +1974,11 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
         }
       }
 
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.spanner.v1.QueryPlanProto
+      @Override
+      protected FieldAccessorTable internalGetFieldAccessorTable() {
+        return QueryPlanProto
             .internal_static_google_spanner_v1_PlanNode_ShortRepresentation_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.spanner.v1.PlanNode.ShortRepresentation.class,
-                com.google.spanner.v1.PlanNode.ShortRepresentation.Builder.class);
+            .ensureFieldAccessorsInitialized(ShortRepresentation.class, Builder.class);
       }
 
       // Construct using com.google.spanner.v1.PlanNode.ShortRepresentation.newBuilder()
@@ -2024,7 +1986,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -2033,7 +1995,7 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @java.lang.Override
+      @Override
       public Builder clear() {
         super.clear();
         description_ = "";
@@ -2042,30 +2004,29 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return com.google.spanner.v1.QueryPlanProto
+        return QueryPlanProto
             .internal_static_google_spanner_v1_PlanNode_ShortRepresentation_descriptor;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.PlanNode.ShortRepresentation getDefaultInstanceForType() {
-        return com.google.spanner.v1.PlanNode.ShortRepresentation.getDefaultInstance();
+      @Override
+      public ShortRepresentation getDefaultInstanceForType() {
+        return ShortRepresentation.getDefaultInstance();
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.PlanNode.ShortRepresentation build() {
-        com.google.spanner.v1.PlanNode.ShortRepresentation result = buildPartial();
+      @Override
+      public ShortRepresentation build() {
+        ShortRepresentation result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.PlanNode.ShortRepresentation buildPartial() {
-        com.google.spanner.v1.PlanNode.ShortRepresentation result =
-            new com.google.spanner.v1.PlanNode.ShortRepresentation(this);
+      @Override
+      public ShortRepresentation buildPartial() {
+        ShortRepresentation result = new ShortRepresentation(this);
         int from_bitField0_ = bitField0_;
         result.description_ = description_;
         result.subqueries_ = internalGetSubqueries();
@@ -2074,54 +2035,50 @@ public com.google.spanner.v1.PlanNode.ShortRepresentation buildPartial() {
         return result;
       }
 
-      @java.lang.Override
+      @Override
       public Builder clone() {
         return super.clone();
       }
 
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      @Override
+      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.setField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @java.lang.Override
+      @Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.spanner.v1.PlanNode.ShortRepresentation) {
-          return mergeFrom((com.google.spanner.v1.PlanNode.ShortRepresentation) other);
+        if (other instanceof ShortRepresentation) {
+          return mergeFrom((ShortRepresentation) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.google.spanner.v1.PlanNode.ShortRepresentation other) {
-        if (other == com.google.spanner.v1.PlanNode.ShortRepresentation.getDefaultInstance())
-          return this;
+      public Builder mergeFrom(ShortRepresentation other) {
+        if (other == ShortRepresentation.getDefaultInstance()) return this;
         if (!other.getDescription().isEmpty()) {
           description_ = other.description_;
           onChanged();
@@ -2132,22 +2089,21 @@ public Builder mergeFrom(com.google.spanner.v1.PlanNode.ShortRepresentation othe
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.spanner.v1.PlanNode.ShortRepresentation parsedMessage = null;
+        ShortRepresentation parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (com.google.spanner.v1.PlanNode.ShortRepresentation) e.getUnfinishedMessage();
+          parsedMessage = (ShortRepresentation) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2159,7 +2115,7 @@ public Builder mergeFrom(
 
       private int bitField0_;
 
-      private java.lang.Object description_ = "";
+      private Object description_ = "";
       /**
        *
        *
@@ -2171,15 +2127,15 @@ public Builder mergeFrom(
        *
        * @return The description.
        */
-      public java.lang.String getDescription() {
-        java.lang.Object ref = description_;
-        if (!(ref instanceof java.lang.String)) {
+      public String getDescription() {
+        Object ref = description_;
+        if (!(ref instanceof String)) {
           com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
+          String s = bs.toStringUtf8();
           description_ = s;
           return s;
         } else {
-          return (java.lang.String) ref;
+          return (String) ref;
         }
       }
       /**
@@ -2194,10 +2150,10 @@ public java.lang.String getDescription() {
        * @return The bytes for description.
        */
       public com.google.protobuf.ByteString getDescriptionBytes() {
-        java.lang.Object ref = description_;
+        Object ref = description_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+              com.google.protobuf.ByteString.copyFromUtf8((String) ref);
           description_ = b;
           return b;
         } else {
@@ -2216,7 +2172,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
        * @param value The description to set.
        * @return This builder for chaining.
        */
-      public Builder setDescription(java.lang.String value) {
+      public Builder setDescription(String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2265,10 +2221,9 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private com.google.protobuf.MapField subqueries_;
+      private com.google.protobuf.MapField subqueries_;
 
-      private com.google.protobuf.MapField
-          internalGetSubqueries() {
+      private com.google.protobuf.MapField internalGetSubqueries() {
         if (subqueries_ == null) {
           return com.google.protobuf.MapField.emptyMapField(
               SubqueriesDefaultEntryHolder.defaultEntry);
@@ -2276,8 +2231,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         return subqueries_;
       }
 
-      private com.google.protobuf.MapField
-          internalGetMutableSubqueries() {
+      private com.google.protobuf.MapField internalGetMutableSubqueries() {
         onChanged();
         ;
         if (subqueries_ == null) {
@@ -2306,17 +2260,17 @@ public int getSubqueriesCount() {
        *
        * map<string, int32> subqueries = 2;
        */
-      @java.lang.Override
-      public boolean containsSubqueries(java.lang.String key) {
+      @Override
+      public boolean containsSubqueries(String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException();
         }
         return internalGetSubqueries().getMap().containsKey(key);
       }
       /** Use {@link #getSubqueriesMap()} instead. */
-      @java.lang.Override
-      @java.lang.Deprecated
-      public java.util.Map getSubqueries() {
+      @Override
+      @Deprecated
+      public java.util.Map getSubqueries() {
         return getSubqueriesMap();
       }
       /**
@@ -2332,8 +2286,8 @@ public java.util.Map getSubqueries() {
        *
        * map<string, int32> subqueries = 2;
        */
-      @java.lang.Override
-      public java.util.Map getSubqueriesMap() {
+      @Override
+      public java.util.Map getSubqueriesMap() {
         return internalGetSubqueries().getMap();
       }
       /**
@@ -2349,12 +2303,12 @@ public java.util.Map getSubqueriesMap() {
        *
        * map<string, int32> subqueries = 2;
        */
-      @java.lang.Override
-      public int getSubqueriesOrDefault(java.lang.String key, int defaultValue) {
+      @Override
+      public int getSubqueriesOrDefault(String key, int defaultValue) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException();
         }
-        java.util.Map map = internalGetSubqueries().getMap();
+        java.util.Map map = internalGetSubqueries().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
@@ -2370,14 +2324,14 @@ public int getSubqueriesOrDefault(java.lang.String key, int defaultValue) {
        *
        * map<string, int32> subqueries = 2;
        */
-      @java.lang.Override
-      public int getSubqueriesOrThrow(java.lang.String key) {
+      @Override
+      public int getSubqueriesOrThrow(String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException();
         }
-        java.util.Map map = internalGetSubqueries().getMap();
+        java.util.Map map = internalGetSubqueries().getMap();
         if (!map.containsKey(key)) {
-          throw new java.lang.IllegalArgumentException();
+          throw new IllegalArgumentException();
         }
         return map.get(key);
       }
@@ -2399,16 +2353,16 @@ public Builder clearSubqueries() {
        *
        * map<string, int32> subqueries = 2;
        */
-      public Builder removeSubqueries(java.lang.String key) {
+      public Builder removeSubqueries(String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException();
         }
         internalGetMutableSubqueries().getMutableMap().remove(key);
         return this;
       }
       /** Use alternate mutation accessors instead. */
-      @java.lang.Deprecated
-      public java.util.Map getMutableSubqueries() {
+      @Deprecated
+      public java.util.Map getMutableSubqueries() {
         return internalGetMutableSubqueries().getMutableMap();
       }
       /**
@@ -2424,9 +2378,9 @@ public java.util.Map getMutableSubqueries()
        *
        * map<string, int32> subqueries = 2;
        */
-      public Builder putSubqueries(java.lang.String key, int value) {
+      public Builder putSubqueries(String key, int value) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException();
         }
 
         internalGetMutableSubqueries().getMutableMap().put(key, value);
@@ -2445,18 +2399,18 @@ public Builder putSubqueries(java.lang.String key, int value) {
        *
        * map<string, int32> subqueries = 2;
        */
-      public Builder putAllSubqueries(java.util.Map values) {
+      public Builder putAllSubqueries(java.util.Map values) {
         internalGetMutableSubqueries().getMutableMap().putAll(values);
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @java.lang.Override
+      @Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2466,19 +2420,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.PlanNode.ShortRepresentation)
-    private static final com.google.spanner.v1.PlanNode.ShortRepresentation DEFAULT_INSTANCE;
+    private static final ShortRepresentation DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new com.google.spanner.v1.PlanNode.ShortRepresentation();
+      DEFAULT_INSTANCE = new ShortRepresentation();
     }
 
-    public static com.google.spanner.v1.PlanNode.ShortRepresentation getDefaultInstance() {
+    public static ShortRepresentation getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @java.lang.Override
+          @Override
           public ShortRepresentation parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2491,13 +2445,13 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PlanNode.ShortRepresentation getDefaultInstanceForType() {
+    @Override
+    public ShortRepresentation getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
@@ -2515,7 +2469,7 @@ public com.google.spanner.v1.PlanNode.ShortRepresentation getDefaultInstanceForT
    *
    * @return The index.
    */
-  @java.lang.Override
+  @Override
   public int getIndex() {
     return index_;
   }
@@ -2537,7 +2491,7 @@ public int getIndex() {
    *
    * @return The enum numeric value on the wire for kind.
    */
-  @java.lang.Override
+  @Override
   public int getKindValue() {
     return kind_;
   }
@@ -2556,15 +2510,15 @@ public int getKindValue() {
    *
    * @return The kind.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.PlanNode.Kind getKind() {
+  @Override
+  public Kind getKind() {
     @SuppressWarnings("deprecation")
-    com.google.spanner.v1.PlanNode.Kind result = com.google.spanner.v1.PlanNode.Kind.valueOf(kind_);
-    return result == null ? com.google.spanner.v1.PlanNode.Kind.UNRECOGNIZED : result;
+    Kind result = Kind.valueOf(kind_);
+    return result == null ? Kind.UNRECOGNIZED : result;
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 3;
-  private volatile java.lang.Object displayName_;
+  private volatile Object displayName_;
   /**
    *
    *
@@ -2576,14 +2530,14 @@ public com.google.spanner.v1.PlanNode.Kind getKind() {
    *
    * @return The displayName.
    */
-  @java.lang.Override
-  public java.lang.String getDisplayName() {
-    java.lang.Object ref = displayName_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getDisplayName() {
+    Object ref = displayName_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       displayName_ = s;
       return s;
     }
@@ -2599,12 +2553,11 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
-  @java.lang.Override
+  @Override
   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);
+    Object ref = displayName_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       displayName_ = b;
       return b;
     } else {
@@ -2613,7 +2566,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int CHILD_LINKS_FIELD_NUMBER = 4;
-  private java.util.List childLinks_;
+  private java.util.List childLinks_;
   /**
    *
    *
@@ -2623,8 +2576,8 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  @java.lang.Override
-  public java.util.List getChildLinksList() {
+  @Override
+  public java.util.List getChildLinksList() {
     return childLinks_;
   }
   /**
@@ -2636,9 +2589,8 @@ public java.util.List getChildLinksLis
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  @java.lang.Override
-  public java.util.List
-      getChildLinksOrBuilderList() {
+  @Override
+  public java.util.List getChildLinksOrBuilderList() {
     return childLinks_;
   }
   /**
@@ -2650,7 +2602,7 @@ public java.util.List getChildLinksLis
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  @java.lang.Override
+  @Override
   public int getChildLinksCount() {
     return childLinks_.size();
   }
@@ -2663,8 +2615,8 @@ public int getChildLinksCount() {
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.PlanNode.ChildLink getChildLinks(int index) {
+  @Override
+  public ChildLink getChildLinks(int index) {
     return childLinks_.get(index);
   }
   /**
@@ -2676,13 +2628,13 @@ public com.google.spanner.v1.PlanNode.ChildLink getChildLinks(int index) {
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.PlanNode.ChildLinkOrBuilder getChildLinksOrBuilder(int index) {
+  @Override
+  public ChildLinkOrBuilder getChildLinksOrBuilder(int index) {
     return childLinks_.get(index);
   }
 
   public static final int SHORT_REPRESENTATION_FIELD_NUMBER = 5;
-  private com.google.spanner.v1.PlanNode.ShortRepresentation shortRepresentation_;
+  private ShortRepresentation shortRepresentation_;
   /**
    *
    *
@@ -2694,7 +2646,7 @@ public com.google.spanner.v1.PlanNode.ChildLinkOrBuilder getChildLinksOrBuilder(
    *
    * @return Whether the shortRepresentation field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasShortRepresentation() {
     return shortRepresentation_ != null;
   }
@@ -2709,10 +2661,10 @@ public boolean hasShortRepresentation() {
    *
    * @return The shortRepresentation.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.PlanNode.ShortRepresentation getShortRepresentation() {
+  @Override
+  public ShortRepresentation getShortRepresentation() {
     return shortRepresentation_ == null
-        ? com.google.spanner.v1.PlanNode.ShortRepresentation.getDefaultInstance()
+        ? ShortRepresentation.getDefaultInstance()
         : shortRepresentation_;
   }
   /**
@@ -2724,9 +2676,8 @@ public com.google.spanner.v1.PlanNode.ShortRepresentation getShortRepresentation
    *
    * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder
-      getShortRepresentationOrBuilder() {
+  @Override
+  public ShortRepresentationOrBuilder getShortRepresentationOrBuilder() {
     return getShortRepresentation();
   }
 
@@ -2749,7 +2700,7 @@ public com.google.spanner.v1.PlanNode.ShortRepresentation getShortRepresentation
    *
    * @return Whether the metadata field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasMetadata() {
     return metadata_ != null;
   }
@@ -2770,7 +2721,7 @@ public boolean hasMetadata() {
    *
    * @return The metadata.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Struct getMetadata() {
     return metadata_ == null ? com.google.protobuf.Struct.getDefaultInstance() : metadata_;
   }
@@ -2789,7 +2740,7 @@ public com.google.protobuf.Struct getMetadata() {
    *
    * .google.protobuf.Struct metadata = 6;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.StructOrBuilder getMetadataOrBuilder() {
     return getMetadata();
   }
@@ -2810,7 +2761,7 @@ public com.google.protobuf.StructOrBuilder getMetadataOrBuilder() {
    *
    * @return Whether the executionStats field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasExecutionStats() {
     return executionStats_ != null;
   }
@@ -2828,7 +2779,7 @@ public boolean hasExecutionStats() {
    *
    * @return The executionStats.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Struct getExecutionStats() {
     return executionStats_ == null
         ? com.google.protobuf.Struct.getDefaultInstance()
@@ -2846,14 +2797,14 @@ public com.google.protobuf.Struct getExecutionStats() {
    *
    * .google.protobuf.Struct execution_stats = 7;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.StructOrBuilder getExecutionStatsOrBuilder() {
     return getExecutionStats();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2863,12 +2814,12 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (index_ != 0) {
       output.writeInt32(1, index_);
     }
-    if (kind_ != com.google.spanner.v1.PlanNode.Kind.KIND_UNSPECIFIED.getNumber()) {
+    if (kind_ != Kind.KIND_UNSPECIFIED.getNumber()) {
       output.writeEnum(2, kind_);
     }
     if (!getDisplayNameBytes().isEmpty()) {
@@ -2889,7 +2840,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2898,7 +2849,7 @@ public int getSerializedSize() {
     if (index_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, index_);
     }
-    if (kind_ != com.google.spanner.v1.PlanNode.Kind.KIND_UNSPECIFIED.getNumber()) {
+    if (kind_ != Kind.KIND_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, kind_);
     }
     if (!getDisplayNameBytes().isEmpty()) {
@@ -2921,15 +2872,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.PlanNode)) {
+    if (!(obj instanceof PlanNode)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.PlanNode other = (com.google.spanner.v1.PlanNode) obj;
+    PlanNode other = (PlanNode) obj;
 
     if (getIndex() != other.getIndex()) return false;
     if (kind_ != other.kind_) return false;
@@ -2951,7 +2902,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -2985,70 +2936,68 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.PlanNode parseFrom(java.nio.ByteBuffer data)
+  public static PlanNode parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PlanNode parseFrom(
+  public static PlanNode parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.PlanNode parseFrom(com.google.protobuf.ByteString data)
+  public static PlanNode parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PlanNode parseFrom(
+  public static PlanNode 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.spanner.v1.PlanNode parseFrom(byte[] data)
+  public static PlanNode parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.PlanNode parseFrom(
+  public static PlanNode parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.PlanNode parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static PlanNode parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PlanNode parseFrom(
+  public static PlanNode 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.spanner.v1.PlanNode parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static PlanNode parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PlanNode parseDelimitedFrom(
+  public static PlanNode 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.spanner.v1.PlanNode parseFrom(com.google.protobuf.CodedInputStream input)
+  public static PlanNode parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.PlanNode parseFrom(
+  public static PlanNode parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -3056,7 +3005,7 @@ public static com.google.spanner.v1.PlanNode parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -3065,17 +3014,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.PlanNode prototype) {
+  public static Builder newBuilder(PlanNode prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -3091,19 +3040,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.PlanNode)
-      com.google.spanner.v1.PlanNodeOrBuilder {
+      PlanNodeOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.QueryPlanProto
-          .internal_static_google_spanner_v1_PlanNode_descriptor;
+      return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.QueryPlanProto
-          .internal_static_google_spanner_v1_PlanNode_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.PlanNode.class, com.google.spanner.v1.PlanNode.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(PlanNode.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.PlanNode.newBuilder()
@@ -3111,7 +3056,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -3122,7 +3067,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       index_ = 0;
@@ -3158,29 +3103,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.QueryPlanProto
-          .internal_static_google_spanner_v1_PlanNode_descriptor;
+      return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PlanNode getDefaultInstanceForType() {
-      return com.google.spanner.v1.PlanNode.getDefaultInstance();
+    @Override
+    public PlanNode getDefaultInstanceForType() {
+      return PlanNode.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PlanNode build() {
-      com.google.spanner.v1.PlanNode result = buildPartial();
+    @Override
+    public PlanNode build() {
+      PlanNode result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.PlanNode buildPartial() {
-      com.google.spanner.v1.PlanNode result = new com.google.spanner.v1.PlanNode(this);
+    @Override
+    public PlanNode buildPartial() {
+      PlanNode result = new PlanNode(this);
       int from_bitField0_ = bitField0_;
       result.index_ = index_;
       result.kind_ = kind_;
@@ -3213,51 +3157,50 @@ public com.google.spanner.v1.PlanNode buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.PlanNode) {
-        return mergeFrom((com.google.spanner.v1.PlanNode) other);
+      if (other instanceof PlanNode) {
+        return mergeFrom((PlanNode) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.PlanNode other) {
-      if (other == com.google.spanner.v1.PlanNode.getDefaultInstance()) return this;
+    public Builder mergeFrom(PlanNode other) {
+      if (other == PlanNode.getDefaultInstance()) return this;
       if (other.getIndex() != 0) {
         setIndex(other.getIndex());
       }
@@ -3309,21 +3252,21 @@ public Builder mergeFrom(com.google.spanner.v1.PlanNode other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.PlanNode parsedMessage = null;
+      PlanNode parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.PlanNode) e.getUnfinishedMessage();
+        parsedMessage = (PlanNode) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -3347,7 +3290,7 @@ public Builder mergeFrom(
      *
      * @return The index.
      */
-    @java.lang.Override
+    @Override
     public int getIndex() {
       return index_;
     }
@@ -3403,7 +3346,7 @@ public Builder clearIndex() {
      *
      * @return The enum numeric value on the wire for kind.
      */
-    @java.lang.Override
+    @Override
     public int getKindValue() {
       return kind_;
     }
@@ -3444,12 +3387,11 @@ public Builder setKindValue(int value) {
      *
      * @return The kind.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.PlanNode.Kind getKind() {
+    @Override
+    public Kind getKind() {
       @SuppressWarnings("deprecation")
-      com.google.spanner.v1.PlanNode.Kind result =
-          com.google.spanner.v1.PlanNode.Kind.valueOf(kind_);
-      return result == null ? com.google.spanner.v1.PlanNode.Kind.UNRECOGNIZED : result;
+      Kind result = Kind.valueOf(kind_);
+      return result == null ? Kind.UNRECOGNIZED : result;
     }
     /**
      *
@@ -3467,7 +3409,7 @@ public com.google.spanner.v1.PlanNode.Kind getKind() {
      * @param value The kind to set.
      * @return This builder for chaining.
      */
-    public Builder setKind(com.google.spanner.v1.PlanNode.Kind value) {
+    public Builder setKind(Kind value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -3498,7 +3440,7 @@ public Builder clearKind() {
       return this;
     }
 
-    private java.lang.Object displayName_ = "";
+    private Object displayName_ = "";
     /**
      *
      *
@@ -3510,15 +3452,15 @@ public Builder clearKind() {
      *
      * @return The displayName.
      */
-    public java.lang.String getDisplayName() {
-      java.lang.Object ref = displayName_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getDisplayName() {
+      Object ref = displayName_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         displayName_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -3533,10 +3475,10 @@ public java.lang.String getDisplayName() {
      * @return The bytes for displayName.
      */
     public com.google.protobuf.ByteString getDisplayNameBytes() {
-      java.lang.Object ref = displayName_;
+      Object ref = displayName_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         displayName_ = b;
         return b;
       } else {
@@ -3555,7 +3497,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
      * @param value The displayName to set.
      * @return This builder for chaining.
      */
-    public Builder setDisplayName(java.lang.String value) {
+    public Builder setDisplayName(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -3604,21 +3546,17 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private java.util.List childLinks_ =
-        java.util.Collections.emptyList();
+    private java.util.List childLinks_ = java.util.Collections.emptyList();
 
     private void ensureChildLinksIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        childLinks_ =
-            new java.util.ArrayList(childLinks_);
+        childLinks_ = new java.util.ArrayList(childLinks_);
         bitField0_ |= 0x00000001;
       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.PlanNode.ChildLink,
-            com.google.spanner.v1.PlanNode.ChildLink.Builder,
-            com.google.spanner.v1.PlanNode.ChildLinkOrBuilder>
+            ChildLink, ChildLink.Builder, ChildLinkOrBuilder>
         childLinksBuilder_;
 
     /**
@@ -3630,7 +3568,7 @@ private void ensureChildLinksIsMutable() {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public java.util.List getChildLinksList() {
+    public java.util.List getChildLinksList() {
       if (childLinksBuilder_ == null) {
         return java.util.Collections.unmodifiableList(childLinks_);
       } else {
@@ -3662,7 +3600,7 @@ public int getChildLinksCount() {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public com.google.spanner.v1.PlanNode.ChildLink getChildLinks(int index) {
+    public ChildLink getChildLinks(int index) {
       if (childLinksBuilder_ == null) {
         return childLinks_.get(index);
       } else {
@@ -3678,7 +3616,7 @@ public com.google.spanner.v1.PlanNode.ChildLink getChildLinks(int index) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder setChildLinks(int index, com.google.spanner.v1.PlanNode.ChildLink value) {
+    public Builder setChildLinks(int index, ChildLink value) {
       if (childLinksBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -3700,8 +3638,7 @@ public Builder setChildLinks(int index, com.google.spanner.v1.PlanNode.ChildLink
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder setChildLinks(
-        int index, com.google.spanner.v1.PlanNode.ChildLink.Builder builderForValue) {
+    public Builder setChildLinks(int index, ChildLink.Builder builderForValue) {
       if (childLinksBuilder_ == null) {
         ensureChildLinksIsMutable();
         childLinks_.set(index, builderForValue.build());
@@ -3720,7 +3657,7 @@ public Builder setChildLinks(
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder addChildLinks(com.google.spanner.v1.PlanNode.ChildLink value) {
+    public Builder addChildLinks(ChildLink value) {
       if (childLinksBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -3742,7 +3679,7 @@ public Builder addChildLinks(com.google.spanner.v1.PlanNode.ChildLink value) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder addChildLinks(int index, com.google.spanner.v1.PlanNode.ChildLink value) {
+    public Builder addChildLinks(int index, ChildLink value) {
       if (childLinksBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -3764,7 +3701,7 @@ public Builder addChildLinks(int index, com.google.spanner.v1.PlanNode.ChildLink
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder addChildLinks(com.google.spanner.v1.PlanNode.ChildLink.Builder builderForValue) {
+    public Builder addChildLinks(ChildLink.Builder builderForValue) {
       if (childLinksBuilder_ == null) {
         ensureChildLinksIsMutable();
         childLinks_.add(builderForValue.build());
@@ -3783,8 +3720,7 @@ public Builder addChildLinks(com.google.spanner.v1.PlanNode.ChildLink.Builder bu
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder addChildLinks(
-        int index, com.google.spanner.v1.PlanNode.ChildLink.Builder builderForValue) {
+    public Builder addChildLinks(int index, ChildLink.Builder builderForValue) {
       if (childLinksBuilder_ == null) {
         ensureChildLinksIsMutable();
         childLinks_.add(index, builderForValue.build());
@@ -3803,8 +3739,7 @@ public Builder addChildLinks(
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder addAllChildLinks(
-        java.lang.Iterable values) {
+    public Builder addAllChildLinks(Iterable values) {
       if (childLinksBuilder_ == null) {
         ensureChildLinksIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, childLinks_);
@@ -3861,7 +3796,7 @@ public Builder removeChildLinks(int index) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public com.google.spanner.v1.PlanNode.ChildLink.Builder getChildLinksBuilder(int index) {
+    public ChildLink.Builder getChildLinksBuilder(int index) {
       return getChildLinksFieldBuilder().getBuilder(index);
     }
     /**
@@ -3873,7 +3808,7 @@ public com.google.spanner.v1.PlanNode.ChildLink.Builder getChildLinksBuilder(int
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public com.google.spanner.v1.PlanNode.ChildLinkOrBuilder getChildLinksOrBuilder(int index) {
+    public ChildLinkOrBuilder getChildLinksOrBuilder(int index) {
       if (childLinksBuilder_ == null) {
         return childLinks_.get(index);
       } else {
@@ -3889,8 +3824,7 @@ public com.google.spanner.v1.PlanNode.ChildLinkOrBuilder getChildLinksOrBuilder(
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public java.util.List
-        getChildLinksOrBuilderList() {
+    public java.util.List getChildLinksOrBuilderList() {
       if (childLinksBuilder_ != null) {
         return childLinksBuilder_.getMessageOrBuilderList();
       } else {
@@ -3906,9 +3840,8 @@ public com.google.spanner.v1.PlanNode.ChildLinkOrBuilder getChildLinksOrBuilder(
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public com.google.spanner.v1.PlanNode.ChildLink.Builder addChildLinksBuilder() {
-      return getChildLinksFieldBuilder()
-          .addBuilder(com.google.spanner.v1.PlanNode.ChildLink.getDefaultInstance());
+    public ChildLink.Builder addChildLinksBuilder() {
+      return getChildLinksFieldBuilder().addBuilder(ChildLink.getDefaultInstance());
     }
     /**
      *
@@ -3919,9 +3852,8 @@ public com.google.spanner.v1.PlanNode.ChildLink.Builder addChildLinksBuilder() {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public com.google.spanner.v1.PlanNode.ChildLink.Builder addChildLinksBuilder(int index) {
-      return getChildLinksFieldBuilder()
-          .addBuilder(index, com.google.spanner.v1.PlanNode.ChildLink.getDefaultInstance());
+    public ChildLink.Builder addChildLinksBuilder(int index) {
+      return getChildLinksFieldBuilder().addBuilder(index, ChildLink.getDefaultInstance());
     }
     /**
      *
@@ -3932,33 +3864,26 @@ public com.google.spanner.v1.PlanNode.ChildLink.Builder addChildLinksBuilder(int
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public java.util.List
-        getChildLinksBuilderList() {
+    public java.util.List getChildLinksBuilderList() {
       return getChildLinksFieldBuilder().getBuilderList();
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.PlanNode.ChildLink,
-            com.google.spanner.v1.PlanNode.ChildLink.Builder,
-            com.google.spanner.v1.PlanNode.ChildLinkOrBuilder>
+            ChildLink, ChildLink.Builder, ChildLinkOrBuilder>
         getChildLinksFieldBuilder() {
       if (childLinksBuilder_ == null) {
         childLinksBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.spanner.v1.PlanNode.ChildLink,
-                com.google.spanner.v1.PlanNode.ChildLink.Builder,
-                com.google.spanner.v1.PlanNode.ChildLinkOrBuilder>(
+                ChildLink, ChildLink.Builder, ChildLinkOrBuilder>(
                 childLinks_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         childLinks_ = null;
       }
       return childLinksBuilder_;
     }
 
-    private com.google.spanner.v1.PlanNode.ShortRepresentation shortRepresentation_;
+    private ShortRepresentation shortRepresentation_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.PlanNode.ShortRepresentation,
-            com.google.spanner.v1.PlanNode.ShortRepresentation.Builder,
-            com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder>
+            ShortRepresentation, ShortRepresentation.Builder, ShortRepresentationOrBuilder>
         shortRepresentationBuilder_;
     /**
      *
@@ -3985,10 +3910,10 @@ public boolean hasShortRepresentation() {
      *
      * @return The shortRepresentation.
      */
-    public com.google.spanner.v1.PlanNode.ShortRepresentation getShortRepresentation() {
+    public ShortRepresentation getShortRepresentation() {
       if (shortRepresentationBuilder_ == null) {
         return shortRepresentation_ == null
-            ? com.google.spanner.v1.PlanNode.ShortRepresentation.getDefaultInstance()
+            ? ShortRepresentation.getDefaultInstance()
             : shortRepresentation_;
       } else {
         return shortRepresentationBuilder_.getMessage();
@@ -4003,8 +3928,7 @@ public com.google.spanner.v1.PlanNode.ShortRepresentation getShortRepresentation
      *
      * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
      */
-    public Builder setShortRepresentation(
-        com.google.spanner.v1.PlanNode.ShortRepresentation value) {
+    public Builder setShortRepresentation(ShortRepresentation value) {
       if (shortRepresentationBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -4026,8 +3950,7 @@ public Builder setShortRepresentation(
      *
      * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
      */
-    public Builder setShortRepresentation(
-        com.google.spanner.v1.PlanNode.ShortRepresentation.Builder builderForValue) {
+    public Builder setShortRepresentation(ShortRepresentation.Builder builderForValue) {
       if (shortRepresentationBuilder_ == null) {
         shortRepresentation_ = builderForValue.build();
         onChanged();
@@ -4046,14 +3969,11 @@ public Builder setShortRepresentation(
      *
      * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
      */
-    public Builder mergeShortRepresentation(
-        com.google.spanner.v1.PlanNode.ShortRepresentation value) {
+    public Builder mergeShortRepresentation(ShortRepresentation value) {
       if (shortRepresentationBuilder_ == null) {
         if (shortRepresentation_ != null) {
           shortRepresentation_ =
-              com.google.spanner.v1.PlanNode.ShortRepresentation.newBuilder(shortRepresentation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+              ShortRepresentation.newBuilder(shortRepresentation_).mergeFrom(value).buildPartial();
         } else {
           shortRepresentation_ = value;
         }
@@ -4093,8 +4013,7 @@ public Builder clearShortRepresentation() {
      *
      * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
      */
-    public com.google.spanner.v1.PlanNode.ShortRepresentation.Builder
-        getShortRepresentationBuilder() {
+    public ShortRepresentation.Builder getShortRepresentationBuilder() {
 
       onChanged();
       return getShortRepresentationFieldBuilder().getBuilder();
@@ -4108,13 +4027,12 @@ public Builder clearShortRepresentation() {
      *
      * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
      */
-    public com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder
-        getShortRepresentationOrBuilder() {
+    public ShortRepresentationOrBuilder getShortRepresentationOrBuilder() {
       if (shortRepresentationBuilder_ != null) {
         return shortRepresentationBuilder_.getMessageOrBuilder();
       } else {
         return shortRepresentation_ == null
-            ? com.google.spanner.v1.PlanNode.ShortRepresentation.getDefaultInstance()
+            ? ShortRepresentation.getDefaultInstance()
             : shortRepresentation_;
       }
     }
@@ -4128,16 +4046,12 @@ public Builder clearShortRepresentation() {
      * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.PlanNode.ShortRepresentation,
-            com.google.spanner.v1.PlanNode.ShortRepresentation.Builder,
-            com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder>
+            ShortRepresentation, ShortRepresentation.Builder, ShortRepresentationOrBuilder>
         getShortRepresentationFieldBuilder() {
       if (shortRepresentationBuilder_ == null) {
         shortRepresentationBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.PlanNode.ShortRepresentation,
-                com.google.spanner.v1.PlanNode.ShortRepresentation.Builder,
-                com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder>(
+                ShortRepresentation, ShortRepresentation.Builder, ShortRepresentationOrBuilder>(
                 getShortRepresentation(), getParentForChildren(), isClean());
         shortRepresentation_ = null;
       }
@@ -4589,12 +4503,12 @@ public com.google.protobuf.StructOrBuilder getExecutionStatsOrBuilder() {
       return executionStatsBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4604,19 +4518,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.PlanNode)
-  private static final com.google.spanner.v1.PlanNode DEFAULT_INSTANCE;
+  private static final PlanNode DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.PlanNode();
+    DEFAULT_INSTANCE = new PlanNode();
   }
 
-  public static com.google.spanner.v1.PlanNode getDefaultInstance() {
+  public static PlanNode getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public PlanNode parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4629,13 +4543,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.PlanNode getDefaultInstanceForType() {
+  @Override
+  public PlanNode getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNodeOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNodeOrBuilder.java
index fa57b333d5..1445315af6 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNodeOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNodeOrBuilder.java
@@ -67,7 +67,7 @@ public interface PlanNodeOrBuilder
    *
    * @return The kind.
    */
-  com.google.spanner.v1.PlanNode.Kind getKind();
+  PlanNode.Kind getKind();
 
   /**
    *
@@ -80,7 +80,7 @@ public interface PlanNodeOrBuilder
    *
    * @return The displayName.
    */
-  java.lang.String getDisplayName();
+  String getDisplayName();
   /**
    *
    *
@@ -103,7 +103,7 @@ public interface PlanNodeOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  java.util.List getChildLinksList();
+  java.util.List getChildLinksList();
   /**
    *
    *
@@ -113,7 +113,7 @@ public interface PlanNodeOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  com.google.spanner.v1.PlanNode.ChildLink getChildLinks(int index);
+  PlanNode.ChildLink getChildLinks(int index);
   /**
    *
    *
@@ -133,8 +133,7 @@ public interface PlanNodeOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  java.util.List
-      getChildLinksOrBuilderList();
+  java.util.List getChildLinksOrBuilderList();
   /**
    *
    *
@@ -144,7 +143,7 @@ public interface PlanNodeOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  com.google.spanner.v1.PlanNode.ChildLinkOrBuilder getChildLinksOrBuilder(int index);
+  PlanNode.ChildLinkOrBuilder getChildLinksOrBuilder(int index);
 
   /**
    *
@@ -169,7 +168,7 @@ public interface PlanNodeOrBuilder
    *
    * @return The shortRepresentation.
    */
-  com.google.spanner.v1.PlanNode.ShortRepresentation getShortRepresentation();
+  PlanNode.ShortRepresentation getShortRepresentation();
   /**
    *
    *
@@ -179,7 +178,7 @@ public interface PlanNodeOrBuilder
    *
    * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
    */
-  com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder getShortRepresentationOrBuilder();
+  PlanNode.ShortRepresentationOrBuilder getShortRepresentationOrBuilder();
 
   /**
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java
index d00d511db2..67b23fb70e 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java
@@ -41,13 +41,13 @@ private QueryPlan() {
     planNodes_ = java.util.Collections.emptyList();
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new QueryPlan();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private QueryPlan(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -74,11 +74,10 @@ private QueryPlan(
           case 10:
             {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                planNodes_ = new java.util.ArrayList();
+                planNodes_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              planNodes_.add(
-                  input.readMessage(com.google.spanner.v1.PlanNode.parser(), extensionRegistry));
+              planNodes_.add(input.readMessage(PlanNode.parser(), extensionRegistry));
               break;
             }
           default:
@@ -104,21 +103,17 @@ private QueryPlan(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.QueryPlanProto
-        .internal_static_google_spanner_v1_QueryPlan_descriptor;
+    return QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.QueryPlanProto
-        .internal_static_google_spanner_v1_QueryPlan_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.QueryPlan.class, com.google.spanner.v1.QueryPlan.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(QueryPlan.class, Builder.class);
   }
 
   public static final int PLAN_NODES_FIELD_NUMBER = 1;
-  private java.util.List planNodes_;
+  private java.util.List planNodes_;
   /**
    *
    *
@@ -130,8 +125,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  @java.lang.Override
-  public java.util.List getPlanNodesList() {
+  @Override
+  public java.util.List getPlanNodesList() {
     return planNodes_;
   }
   /**
@@ -145,9 +140,8 @@ public java.util.List getPlanNodesList() {
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  @java.lang.Override
-  public java.util.List
-      getPlanNodesOrBuilderList() {
+  @Override
+  public java.util.List getPlanNodesOrBuilderList() {
     return planNodes_;
   }
   /**
@@ -161,7 +155,7 @@ public java.util.List getPlanNodesList() {
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  @java.lang.Override
+  @Override
   public int getPlanNodesCount() {
     return planNodes_.size();
   }
@@ -176,8 +170,8 @@ public int getPlanNodesCount() {
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.PlanNode getPlanNodes(int index) {
+  @Override
+  public PlanNode getPlanNodes(int index) {
     return planNodes_.get(index);
   }
   /**
@@ -191,14 +185,14 @@ public com.google.spanner.v1.PlanNode getPlanNodes(int index) {
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.PlanNodeOrBuilder getPlanNodesOrBuilder(int index) {
+  @Override
+  public PlanNodeOrBuilder getPlanNodesOrBuilder(int index) {
     return planNodes_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -208,7 +202,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < planNodes_.size(); i++) {
       output.writeMessage(1, planNodes_.get(i));
@@ -216,7 +210,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -230,22 +224,22 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.QueryPlan)) {
+    if (!(obj instanceof QueryPlan)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.QueryPlan other = (com.google.spanner.v1.QueryPlan) obj;
+    QueryPlan other = (QueryPlan) obj;
 
     if (!getPlanNodesList().equals(other.getPlanNodesList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -261,70 +255,68 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.QueryPlan parseFrom(java.nio.ByteBuffer data)
+  public static QueryPlan parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.QueryPlan parseFrom(
+  public static QueryPlan parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.QueryPlan parseFrom(com.google.protobuf.ByteString data)
+  public static QueryPlan parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.QueryPlan parseFrom(
+  public static QueryPlan 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.spanner.v1.QueryPlan parseFrom(byte[] data)
+  public static QueryPlan parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.QueryPlan parseFrom(
+  public static QueryPlan parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.QueryPlan parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static QueryPlan parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.QueryPlan parseFrom(
+  public static QueryPlan 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.spanner.v1.QueryPlan parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static QueryPlan parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.QueryPlan parseDelimitedFrom(
+  public static QueryPlan 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.spanner.v1.QueryPlan parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static QueryPlan parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.QueryPlan parseFrom(
+  public static QueryPlan parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -332,7 +324,7 @@ public static com.google.spanner.v1.QueryPlan parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -341,17 +333,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.QueryPlan prototype) {
+  public static Builder newBuilder(QueryPlan prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -367,19 +359,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.QueryPlan)
-      com.google.spanner.v1.QueryPlanOrBuilder {
+      QueryPlanOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.QueryPlanProto
-          .internal_static_google_spanner_v1_QueryPlan_descriptor;
+      return QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.QueryPlanProto
-          .internal_static_google_spanner_v1_QueryPlan_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.QueryPlan.class, com.google.spanner.v1.QueryPlan.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(QueryPlan.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.QueryPlan.newBuilder()
@@ -387,7 +375,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -398,7 +386,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       if (planNodesBuilder_ == null) {
@@ -410,29 +398,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.QueryPlanProto
-          .internal_static_google_spanner_v1_QueryPlan_descriptor;
+      return QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.QueryPlan getDefaultInstanceForType() {
-      return com.google.spanner.v1.QueryPlan.getDefaultInstance();
+    @Override
+    public QueryPlan getDefaultInstanceForType() {
+      return QueryPlan.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.QueryPlan build() {
-      com.google.spanner.v1.QueryPlan result = buildPartial();
+    @Override
+    public QueryPlan build() {
+      QueryPlan result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.QueryPlan buildPartial() {
-      com.google.spanner.v1.QueryPlan result = new com.google.spanner.v1.QueryPlan(this);
+    @Override
+    public QueryPlan buildPartial() {
+      QueryPlan result = new QueryPlan(this);
       int from_bitField0_ = bitField0_;
       if (planNodesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -447,51 +434,50 @@ public com.google.spanner.v1.QueryPlan buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.QueryPlan) {
-        return mergeFrom((com.google.spanner.v1.QueryPlan) other);
+      if (other instanceof QueryPlan) {
+        return mergeFrom((QueryPlan) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.QueryPlan other) {
-      if (other == com.google.spanner.v1.QueryPlan.getDefaultInstance()) return this;
+    public Builder mergeFrom(QueryPlan other) {
+      if (other == QueryPlan.getDefaultInstance()) return this;
       if (planNodesBuilder_ == null) {
         if (!other.planNodes_.isEmpty()) {
           if (planNodes_.isEmpty()) {
@@ -524,21 +510,21 @@ public Builder mergeFrom(com.google.spanner.v1.QueryPlan other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.QueryPlan parsedMessage = null;
+      QueryPlan parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.QueryPlan) e.getUnfinishedMessage();
+        parsedMessage = (QueryPlan) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -550,20 +536,17 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.util.List planNodes_ =
-        java.util.Collections.emptyList();
+    private java.util.List planNodes_ = java.util.Collections.emptyList();
 
     private void ensurePlanNodesIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        planNodes_ = new java.util.ArrayList(planNodes_);
+        planNodes_ = new java.util.ArrayList(planNodes_);
         bitField0_ |= 0x00000001;
       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.PlanNode,
-            com.google.spanner.v1.PlanNode.Builder,
-            com.google.spanner.v1.PlanNodeOrBuilder>
+            PlanNode, PlanNode.Builder, PlanNodeOrBuilder>
         planNodesBuilder_;
 
     /**
@@ -577,7 +560,7 @@ private void ensurePlanNodesIsMutable() {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public java.util.List getPlanNodesList() {
+    public java.util.List getPlanNodesList() {
       if (planNodesBuilder_ == null) {
         return java.util.Collections.unmodifiableList(planNodes_);
       } else {
@@ -613,7 +596,7 @@ public int getPlanNodesCount() {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public com.google.spanner.v1.PlanNode getPlanNodes(int index) {
+    public PlanNode getPlanNodes(int index) {
       if (planNodesBuilder_ == null) {
         return planNodes_.get(index);
       } else {
@@ -631,7 +614,7 @@ public com.google.spanner.v1.PlanNode getPlanNodes(int index) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder setPlanNodes(int index, com.google.spanner.v1.PlanNode value) {
+    public Builder setPlanNodes(int index, PlanNode value) {
       if (planNodesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -655,7 +638,7 @@ public Builder setPlanNodes(int index, com.google.spanner.v1.PlanNode value) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder setPlanNodes(int index, com.google.spanner.v1.PlanNode.Builder builderForValue) {
+    public Builder setPlanNodes(int index, PlanNode.Builder builderForValue) {
       if (planNodesBuilder_ == null) {
         ensurePlanNodesIsMutable();
         planNodes_.set(index, builderForValue.build());
@@ -676,7 +659,7 @@ public Builder setPlanNodes(int index, com.google.spanner.v1.PlanNode.Builder bu
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder addPlanNodes(com.google.spanner.v1.PlanNode value) {
+    public Builder addPlanNodes(PlanNode value) {
       if (planNodesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -700,7 +683,7 @@ public Builder addPlanNodes(com.google.spanner.v1.PlanNode value) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder addPlanNodes(int index, com.google.spanner.v1.PlanNode value) {
+    public Builder addPlanNodes(int index, PlanNode value) {
       if (planNodesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -724,7 +707,7 @@ public Builder addPlanNodes(int index, com.google.spanner.v1.PlanNode value) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder addPlanNodes(com.google.spanner.v1.PlanNode.Builder builderForValue) {
+    public Builder addPlanNodes(PlanNode.Builder builderForValue) {
       if (planNodesBuilder_ == null) {
         ensurePlanNodesIsMutable();
         planNodes_.add(builderForValue.build());
@@ -745,7 +728,7 @@ public Builder addPlanNodes(com.google.spanner.v1.PlanNode.Builder builderForVal
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder addPlanNodes(int index, com.google.spanner.v1.PlanNode.Builder builderForValue) {
+    public Builder addPlanNodes(int index, PlanNode.Builder builderForValue) {
       if (planNodesBuilder_ == null) {
         ensurePlanNodesIsMutable();
         planNodes_.add(index, builderForValue.build());
@@ -766,8 +749,7 @@ public Builder addPlanNodes(int index, com.google.spanner.v1.PlanNode.Builder bu
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder addAllPlanNodes(
-        java.lang.Iterable values) {
+    public Builder addAllPlanNodes(Iterable values) {
       if (planNodesBuilder_ == null) {
         ensurePlanNodesIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, planNodes_);
@@ -830,7 +812,7 @@ public Builder removePlanNodes(int index) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public com.google.spanner.v1.PlanNode.Builder getPlanNodesBuilder(int index) {
+    public PlanNode.Builder getPlanNodesBuilder(int index) {
       return getPlanNodesFieldBuilder().getBuilder(index);
     }
     /**
@@ -844,7 +826,7 @@ public com.google.spanner.v1.PlanNode.Builder getPlanNodesBuilder(int index) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public com.google.spanner.v1.PlanNodeOrBuilder getPlanNodesOrBuilder(int index) {
+    public PlanNodeOrBuilder getPlanNodesOrBuilder(int index) {
       if (planNodesBuilder_ == null) {
         return planNodes_.get(index);
       } else {
@@ -862,8 +844,7 @@ public com.google.spanner.v1.PlanNodeOrBuilder getPlanNodesOrBuilder(int index)
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public java.util.List
-        getPlanNodesOrBuilderList() {
+    public java.util.List getPlanNodesOrBuilderList() {
       if (planNodesBuilder_ != null) {
         return planNodesBuilder_.getMessageOrBuilderList();
       } else {
@@ -881,9 +862,8 @@ public com.google.spanner.v1.PlanNodeOrBuilder getPlanNodesOrBuilder(int index)
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public com.google.spanner.v1.PlanNode.Builder addPlanNodesBuilder() {
-      return getPlanNodesFieldBuilder()
-          .addBuilder(com.google.spanner.v1.PlanNode.getDefaultInstance());
+    public PlanNode.Builder addPlanNodesBuilder() {
+      return getPlanNodesFieldBuilder().addBuilder(PlanNode.getDefaultInstance());
     }
     /**
      *
@@ -896,9 +876,8 @@ public com.google.spanner.v1.PlanNode.Builder addPlanNodesBuilder() {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public com.google.spanner.v1.PlanNode.Builder addPlanNodesBuilder(int index) {
-      return getPlanNodesFieldBuilder()
-          .addBuilder(index, com.google.spanner.v1.PlanNode.getDefaultInstance());
+    public PlanNode.Builder addPlanNodesBuilder(int index) {
+      return getPlanNodesFieldBuilder().addBuilder(index, PlanNode.getDefaultInstance());
     }
     /**
      *
@@ -911,33 +890,29 @@ public com.google.spanner.v1.PlanNode.Builder addPlanNodesBuilder(int index) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public java.util.List getPlanNodesBuilderList() {
+    public java.util.List getPlanNodesBuilderList() {
       return getPlanNodesFieldBuilder().getBuilderList();
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.PlanNode,
-            com.google.spanner.v1.PlanNode.Builder,
-            com.google.spanner.v1.PlanNodeOrBuilder>
+            PlanNode, PlanNode.Builder, PlanNodeOrBuilder>
         getPlanNodesFieldBuilder() {
       if (planNodesBuilder_ == null) {
         planNodesBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.spanner.v1.PlanNode,
-                com.google.spanner.v1.PlanNode.Builder,
-                com.google.spanner.v1.PlanNodeOrBuilder>(
+                PlanNode, PlanNode.Builder, PlanNodeOrBuilder>(
                 planNodes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         planNodes_ = null;
       }
       return planNodesBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -947,19 +922,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.QueryPlan)
-  private static final com.google.spanner.v1.QueryPlan DEFAULT_INSTANCE;
+  private static final QueryPlan DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.QueryPlan();
+    DEFAULT_INSTANCE = new QueryPlan();
   }
 
-  public static com.google.spanner.v1.QueryPlan getDefaultInstance() {
+  public static QueryPlan getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public QueryPlan parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -972,13 +947,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.QueryPlan getDefaultInstanceForType() {
+  @Override
+  public QueryPlan getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanOrBuilder.java
index 2c570c1e9e..cd271bc738 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanOrBuilder.java
@@ -34,7 +34,7 @@ public interface QueryPlanOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  java.util.List getPlanNodesList();
+  java.util.List getPlanNodesList();
   /**
    *
    *
@@ -46,7 +46,7 @@ public interface QueryPlanOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  com.google.spanner.v1.PlanNode getPlanNodes(int index);
+  PlanNode getPlanNodes(int index);
   /**
    *
    *
@@ -70,7 +70,7 @@ public interface QueryPlanOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  java.util.List getPlanNodesOrBuilderList();
+  java.util.List getPlanNodesOrBuilderList();
   /**
    *
    *
@@ -82,5 +82,5 @@ public interface QueryPlanOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  com.google.spanner.v1.PlanNodeOrBuilder getPlanNodesOrBuilder(int index);
+  PlanNodeOrBuilder getPlanNodesOrBuilder(int index);
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java
index 03c05431d0..16d91062b0 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java
@@ -55,7 +55,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
   static {
-    java.lang.String[] descriptorData = {
+    String[] descriptorData = {
       "\n\"google/spanner/v1/query_plan.proto\022\021go"
           + "ogle.spanner.v1\032\034google/protobuf/struct."
           + "proto\032\034google/api/annotations.proto\"\370\004\n\010"
@@ -95,7 +95,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_PlanNode_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_PlanNode_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Index",
               "Kind",
               "DisplayName",
@@ -109,7 +109,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_PlanNode_ChildLink_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "ChildIndex", "Type", "Variable",
             });
     internal_static_google_spanner_v1_PlanNode_ShortRepresentation_descriptor =
@@ -117,7 +117,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_PlanNode_ShortRepresentation_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_PlanNode_ShortRepresentation_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Description", "Subqueries",
             });
     internal_static_google_spanner_v1_PlanNode_ShortRepresentation_SubqueriesEntry_descriptor =
@@ -127,7 +127,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_PlanNode_ShortRepresentation_SubqueriesEntry_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_PlanNode_ShortRepresentation_SubqueriesEntry_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Key", "Value",
             });
     internal_static_google_spanner_v1_QueryPlan_descriptor =
@@ -135,7 +135,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_QueryPlan_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_QueryPlan_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "PlanNodes",
             });
     com.google.protobuf.StructProto.getDescriptor();
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java
index 38dd755615..2b95b01b66 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java
@@ -78,104 +78,104 @@ private ReadRequest(
             done = true;
             break;
           case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+          {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              session_ = s;
-              break;
-            }
+            session_ = s;
+            break;
+          }
           case 18:
-            {
-              com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
-              if (transaction_ != null) {
-                subBuilder = transaction_.toBuilder();
-              }
-              transaction_ =
-                  input.readMessage(
-                      com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(transaction_);
-                transaction_ = subBuilder.buildPartial();
-              }
-
-              break;
+          {
+            com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
+            if (transaction_ != null) {
+              subBuilder = transaction_.toBuilder();
+            }
+            transaction_ =
+                input.readMessage(
+                    com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(transaction_);
+              transaction_ = subBuilder.buildPartial();
             }
+
+            break;
+          }
           case 26:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+          {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              table_ = s;
-              break;
-            }
+            table_ = s;
+            break;
+          }
           case 34:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+          {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              index_ = s;
-              break;
-            }
+            index_ = s;
+            break;
+          }
           case 42:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                columns_ = new com.google.protobuf.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              columns_.add(s);
-              break;
+          {
+            java.lang.String s = input.readStringRequireUtf8();
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              columns_ = new com.google.protobuf.LazyStringArrayList();
+              mutable_bitField0_ |= 0x00000001;
             }
+            columns_.add(s);
+            break;
+          }
           case 50:
-            {
-              com.google.spanner.v1.KeySet.Builder subBuilder = null;
-              if (keySet_ != null) {
-                subBuilder = keySet_.toBuilder();
-              }
-              keySet_ = input.readMessage(com.google.spanner.v1.KeySet.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(keySet_);
-                keySet_ = subBuilder.buildPartial();
-              }
-
-              break;
+          {
+            com.google.spanner.v1.KeySet.Builder subBuilder = null;
+            if (keySet_ != null) {
+              subBuilder = keySet_.toBuilder();
             }
-          case 64:
-            {
-              limit_ = input.readInt64();
-              break;
+            keySet_ = input.readMessage(com.google.spanner.v1.KeySet.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(keySet_);
+              keySet_ = subBuilder.buildPartial();
             }
+
+            break;
+          }
+          case 64:
+          {
+            limit_ = input.readInt64();
+            break;
+          }
           case 74:
-            {
-              resumeToken_ = input.readBytes();
-              break;
-            }
+          {
+            resumeToken_ = input.readBytes();
+            break;
+          }
           case 82:
-            {
-              partitionToken_ = input.readBytes();
-              break;
-            }
+          {
+            partitionToken_ = input.readBytes();
+            break;
+          }
           case 90:
-            {
-              com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
-              if (requestOptions_ != null) {
-                subBuilder = requestOptions_.toBuilder();
-              }
-              requestOptions_ =
-                  input.readMessage(
-                      com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(requestOptions_);
-                requestOptions_ = subBuilder.buildPartial();
-              }
-
-              break;
+          {
+            com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
+            if (requestOptions_ != null) {
+              subBuilder = requestOptions_.toBuilder();
+            }
+            requestOptions_ =
+                input.readMessage(
+                    com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(requestOptions_);
+              requestOptions_ = subBuilder.buildPartial();
             }
+
+            break;
+          }
           default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+          {
+            if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -198,7 +198,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
+  internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto
         .internal_static_google_spanner_v1_ReadRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
@@ -943,7 +943,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
+    internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_ReadRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -1291,9 +1291,9 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
 
     private com.google.spanner.v1.TransactionSelector transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionSelector,
-            com.google.spanner.v1.TransactionSelector.Builder,
-            com.google.spanner.v1.TransactionSelectorOrBuilder>
+        com.google.spanner.v1.TransactionSelector,
+        com.google.spanner.v1.TransactionSelector.Builder,
+        com.google.spanner.v1.TransactionSelectorOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -1468,10 +1468,10 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionSelector,
-            com.google.spanner.v1.TransactionSelector.Builder,
-            com.google.spanner.v1.TransactionSelectorOrBuilder>
-        getTransactionFieldBuilder() {
+        com.google.spanner.v1.TransactionSelector,
+        com.google.spanner.v1.TransactionSelector.Builder,
+        com.google.spanner.v1.TransactionSelectorOrBuilder>
+    getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -1885,9 +1885,9 @@ public Builder addColumnsBytes(com.google.protobuf.ByteString value) {
 
     private com.google.spanner.v1.KeySet keySet_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.KeySet,
-            com.google.spanner.v1.KeySet.Builder,
-            com.google.spanner.v1.KeySetOrBuilder>
+        com.google.spanner.v1.KeySet,
+        com.google.spanner.v1.KeySet.Builder,
+        com.google.spanner.v1.KeySetOrBuilder>
         keySetBuilder_;
     /**
      *
@@ -2127,10 +2127,10 @@ public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.KeySet,
-            com.google.spanner.v1.KeySet.Builder,
-            com.google.spanner.v1.KeySetOrBuilder>
-        getKeySetFieldBuilder() {
+        com.google.spanner.v1.KeySet,
+        com.google.spanner.v1.KeySet.Builder,
+        com.google.spanner.v1.KeySetOrBuilder>
+    getKeySetFieldBuilder() {
       if (keySetBuilder_ == null) {
         keySetBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -2337,9 +2337,9 @@ public Builder clearPartitionToken() {
 
     private com.google.spanner.v1.RequestOptions requestOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.RequestOptions,
-            com.google.spanner.v1.RequestOptions.Builder,
-            com.google.spanner.v1.RequestOptionsOrBuilder>
+        com.google.spanner.v1.RequestOptions,
+        com.google.spanner.v1.RequestOptions.Builder,
+        com.google.spanner.v1.RequestOptionsOrBuilder>
         requestOptionsBuilder_;
     /**
      *
@@ -2504,10 +2504,10 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder(
      * .google.spanner.v1.RequestOptions request_options = 11;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.RequestOptions,
-            com.google.spanner.v1.RequestOptions.Builder,
-            com.google.spanner.v1.RequestOptionsOrBuilder>
-        getRequestOptionsFieldBuilder() {
+        com.google.spanner.v1.RequestOptions,
+        com.google.spanner.v1.RequestOptions.Builder,
+        com.google.spanner.v1.RequestOptionsOrBuilder>
+    getRequestOptionsFieldBuilder() {
       if (requestOptionsBuilder_ == null) {
         requestOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -2569,4 +2569,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.spanner.v1.ReadRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-}
+}
\ No newline at end of file
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequestOrBuilder.java
index 5988afde18..132eec65ac 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface ReadRequestOrBuilder
    *
    * @return The session.
    */
-  java.lang.String getSession();
+  String getSession();
   /**
    *
    *
@@ -77,7 +77,7 @@ public interface ReadRequestOrBuilder
    *
    * @return The transaction.
    */
-  com.google.spanner.v1.TransactionSelector getTransaction();
+  TransactionSelector getTransaction();
   /**
    *
    *
@@ -88,7 +88,7 @@ public interface ReadRequestOrBuilder
    *
    * .google.spanner.v1.TransactionSelector transaction = 2;
    */
-  com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder();
+  TransactionSelectorOrBuilder getTransactionOrBuilder();
 
   /**
    *
@@ -101,7 +101,7 @@ public interface ReadRequestOrBuilder
    *
    * @return The table.
    */
-  java.lang.String getTable();
+  String getTable();
   /**
    *
    *
@@ -128,7 +128,7 @@ public interface ReadRequestOrBuilder
    *
    * @return The index.
    */
-  java.lang.String getIndex();
+  String getIndex();
   /**
    *
    *
@@ -156,7 +156,7 @@ public interface ReadRequestOrBuilder
    *
    * @return A list containing the columns.
    */
-  java.util.List getColumnsList();
+  java.util.List getColumnsList();
   /**
    *
    *
@@ -183,7 +183,7 @@ public interface ReadRequestOrBuilder
    * @param index The index of the element to return.
    * @return The columns at the given index.
    */
-  java.lang.String getColumns(int index);
+  String getColumns(int index);
   /**
    *
    *
@@ -240,7 +240,7 @@ public interface ReadRequestOrBuilder
    *
    * @return The keySet.
    */
-  com.google.spanner.v1.KeySet getKeySet();
+  KeySet getKeySet();
   /**
    *
    *
@@ -259,7 +259,7 @@ public interface ReadRequestOrBuilder
    *
    * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
    */
-  com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder();
+  KeySetOrBuilder getKeySetOrBuilder();
 
   /**
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RequestOptions.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RequestOptions.java
index 6d0d1f7926..51982b1b8f 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RequestOptions.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RequestOptions.java
@@ -680,7 +680,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
+    internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_RequestOptions_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java
index 18f72a29bd..e2ccd817af 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java
@@ -42,13 +42,13 @@ private ResultSet() {
     rows_ = java.util.Collections.emptyList();
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new ResultSet();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private ResultSet(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -74,13 +74,11 @@ private ResultSet(
             break;
           case 10:
             {
-              com.google.spanner.v1.ResultSetMetadata.Builder subBuilder = null;
+              ResultSetMetadata.Builder subBuilder = null;
               if (metadata_ != null) {
                 subBuilder = metadata_.toBuilder();
               }
-              metadata_ =
-                  input.readMessage(
-                      com.google.spanner.v1.ResultSetMetadata.parser(), extensionRegistry);
+              metadata_ = input.readMessage(ResultSetMetadata.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(metadata_);
                 metadata_ = subBuilder.buildPartial();
@@ -100,13 +98,11 @@ private ResultSet(
             }
           case 26:
             {
-              com.google.spanner.v1.ResultSetStats.Builder subBuilder = null;
+              ResultSetStats.Builder subBuilder = null;
               if (stats_ != null) {
                 subBuilder = stats_.toBuilder();
               }
-              stats_ =
-                  input.readMessage(
-                      com.google.spanner.v1.ResultSetStats.parser(), extensionRegistry);
+              stats_ = input.readMessage(ResultSetStats.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(stats_);
                 stats_ = subBuilder.buildPartial();
@@ -137,21 +133,17 @@ private ResultSet(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.ResultSetProto
-        .internal_static_google_spanner_v1_ResultSet_descriptor;
+    return ResultSetProto.internal_static_google_spanner_v1_ResultSet_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.ResultSetProto
-        .internal_static_google_spanner_v1_ResultSet_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.ResultSet.class, com.google.spanner.v1.ResultSet.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return ResultSetProto.internal_static_google_spanner_v1_ResultSet_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(ResultSet.class, Builder.class);
   }
 
   public static final int METADATA_FIELD_NUMBER = 1;
-  private com.google.spanner.v1.ResultSetMetadata metadata_;
+  private ResultSetMetadata metadata_;
   /**
    *
    *
@@ -163,7 +155,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the metadata field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasMetadata() {
     return metadata_ != null;
   }
@@ -178,11 +170,9 @@ public boolean hasMetadata() {
    *
    * @return The metadata.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.ResultSetMetadata getMetadata() {
-    return metadata_ == null
-        ? com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()
-        : metadata_;
+  @Override
+  public ResultSetMetadata getMetadata() {
+    return metadata_ == null ? ResultSetMetadata.getDefaultInstance() : metadata_;
   }
   /**
    *
@@ -193,8 +183,8 @@ public com.google.spanner.v1.ResultSetMetadata getMetadata() {
    *
    * .google.spanner.v1.ResultSetMetadata metadata = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() {
+  @Override
+  public ResultSetMetadataOrBuilder getMetadataOrBuilder() {
     return getMetadata();
   }
 
@@ -214,7 +204,7 @@ public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() {
    *
    * repeated .google.protobuf.ListValue rows = 2;
    */
-  @java.lang.Override
+  @Override
   public java.util.List getRowsList() {
     return rows_;
   }
@@ -232,7 +222,7 @@ public java.util.List getRowsList() {
    *
    * repeated .google.protobuf.ListValue rows = 2;
    */
-  @java.lang.Override
+  @Override
   public java.util.List getRowsOrBuilderList() {
     return rows_;
   }
@@ -250,7 +240,7 @@ public java.util.List getRowsO
    *
    * repeated .google.protobuf.ListValue rows = 2;
    */
-  @java.lang.Override
+  @Override
   public int getRowsCount() {
     return rows_.size();
   }
@@ -268,7 +258,7 @@ public int getRowsCount() {
    *
    * repeated .google.protobuf.ListValue rows = 2;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ListValue getRows(int index) {
     return rows_.get(index);
   }
@@ -286,13 +276,13 @@ public com.google.protobuf.ListValue getRows(int index) {
    *
    * repeated .google.protobuf.ListValue rows = 2;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ListValueOrBuilder getRowsOrBuilder(int index) {
     return rows_.get(index);
   }
 
   public static final int STATS_FIELD_NUMBER = 3;
-  private com.google.spanner.v1.ResultSetStats stats_;
+  private ResultSetStats stats_;
   /**
    *
    *
@@ -311,7 +301,7 @@ public com.google.protobuf.ListValueOrBuilder getRowsOrBuilder(int index) {
    *
    * @return Whether the stats field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasStats() {
     return stats_ != null;
   }
@@ -333,9 +323,9 @@ public boolean hasStats() {
    *
    * @return The stats.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.ResultSetStats getStats() {
-    return stats_ == null ? com.google.spanner.v1.ResultSetStats.getDefaultInstance() : stats_;
+  @Override
+  public ResultSetStats getStats() {
+    return stats_ == null ? ResultSetStats.getDefaultInstance() : stats_;
   }
   /**
    *
@@ -353,14 +343,14 @@ public com.google.spanner.v1.ResultSetStats getStats() {
    *
    * .google.spanner.v1.ResultSetStats stats = 3;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
+  @Override
+  public ResultSetStatsOrBuilder getStatsOrBuilder() {
     return getStats();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -370,7 +360,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (metadata_ != null) {
       output.writeMessage(1, getMetadata());
@@ -384,7 +374,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -404,15 +394,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.ResultSet)) {
+    if (!(obj instanceof ResultSet)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.ResultSet other = (com.google.spanner.v1.ResultSet) obj;
+    ResultSet other = (ResultSet) obj;
 
     if (hasMetadata() != other.hasMetadata()) return false;
     if (hasMetadata()) {
@@ -427,7 +417,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -451,70 +441,68 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.ResultSet parseFrom(java.nio.ByteBuffer data)
+  public static ResultSet parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ResultSet parseFrom(
+  public static ResultSet parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.ResultSet parseFrom(com.google.protobuf.ByteString data)
+  public static ResultSet parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ResultSet parseFrom(
+  public static ResultSet 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.spanner.v1.ResultSet parseFrom(byte[] data)
+  public static ResultSet parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ResultSet parseFrom(
+  public static ResultSet parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.ResultSet parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static ResultSet parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ResultSet parseFrom(
+  public static ResultSet 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.spanner.v1.ResultSet parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static ResultSet parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ResultSet parseDelimitedFrom(
+  public static ResultSet 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.spanner.v1.ResultSet parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static ResultSet parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ResultSet parseFrom(
+  public static ResultSet parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -522,7 +510,7 @@ public static com.google.spanner.v1.ResultSet parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -531,17 +519,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.ResultSet prototype) {
+  public static Builder newBuilder(ResultSet prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -558,19 +546,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.ResultSet)
-      com.google.spanner.v1.ResultSetOrBuilder {
+      ResultSetOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.ResultSetProto
-          .internal_static_google_spanner_v1_ResultSet_descriptor;
+      return ResultSetProto.internal_static_google_spanner_v1_ResultSet_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.ResultSetProto
-          .internal_static_google_spanner_v1_ResultSet_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.ResultSet.class, com.google.spanner.v1.ResultSet.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return ResultSetProto.internal_static_google_spanner_v1_ResultSet_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(ResultSet.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.ResultSet.newBuilder()
@@ -578,7 +562,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -589,7 +573,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       if (metadataBuilder_ == null) {
@@ -613,29 +597,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.ResultSetProto
-          .internal_static_google_spanner_v1_ResultSet_descriptor;
+      return ResultSetProto.internal_static_google_spanner_v1_ResultSet_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ResultSet getDefaultInstanceForType() {
-      return com.google.spanner.v1.ResultSet.getDefaultInstance();
+    @Override
+    public ResultSet getDefaultInstanceForType() {
+      return ResultSet.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ResultSet build() {
-      com.google.spanner.v1.ResultSet result = buildPartial();
+    @Override
+    public ResultSet build() {
+      ResultSet result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ResultSet buildPartial() {
-      com.google.spanner.v1.ResultSet result = new com.google.spanner.v1.ResultSet(this);
+    @Override
+    public ResultSet buildPartial() {
+      ResultSet result = new ResultSet(this);
       int from_bitField0_ = bitField0_;
       if (metadataBuilder_ == null) {
         result.metadata_ = metadata_;
@@ -660,51 +643,50 @@ public com.google.spanner.v1.ResultSet buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.ResultSet) {
-        return mergeFrom((com.google.spanner.v1.ResultSet) other);
+      if (other instanceof ResultSet) {
+        return mergeFrom((ResultSet) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.ResultSet other) {
-      if (other == com.google.spanner.v1.ResultSet.getDefaultInstance()) return this;
+    public Builder mergeFrom(ResultSet other) {
+      if (other == ResultSet.getDefaultInstance()) return this;
       if (other.hasMetadata()) {
         mergeMetadata(other.getMetadata());
       }
@@ -743,21 +725,21 @@ public Builder mergeFrom(com.google.spanner.v1.ResultSet other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.ResultSet parsedMessage = null;
+      ResultSet parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.ResultSet) e.getUnfinishedMessage();
+        parsedMessage = (ResultSet) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -769,11 +751,9 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.spanner.v1.ResultSetMetadata metadata_;
+    private ResultSetMetadata metadata_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.ResultSetMetadata,
-            com.google.spanner.v1.ResultSetMetadata.Builder,
-            com.google.spanner.v1.ResultSetMetadataOrBuilder>
+            ResultSetMetadata, ResultSetMetadata.Builder, ResultSetMetadataOrBuilder>
         metadataBuilder_;
     /**
      *
@@ -800,11 +780,9 @@ public boolean hasMetadata() {
      *
      * @return The metadata.
      */
-    public com.google.spanner.v1.ResultSetMetadata getMetadata() {
+    public ResultSetMetadata getMetadata() {
       if (metadataBuilder_ == null) {
-        return metadata_ == null
-            ? com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()
-            : metadata_;
+        return metadata_ == null ? ResultSetMetadata.getDefaultInstance() : metadata_;
       } else {
         return metadataBuilder_.getMessage();
       }
@@ -818,7 +796,7 @@ public com.google.spanner.v1.ResultSetMetadata getMetadata() {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public Builder setMetadata(com.google.spanner.v1.ResultSetMetadata value) {
+    public Builder setMetadata(ResultSetMetadata value) {
       if (metadataBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -840,7 +818,7 @@ public Builder setMetadata(com.google.spanner.v1.ResultSetMetadata value) {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public Builder setMetadata(com.google.spanner.v1.ResultSetMetadata.Builder builderForValue) {
+    public Builder setMetadata(ResultSetMetadata.Builder builderForValue) {
       if (metadataBuilder_ == null) {
         metadata_ = builderForValue.build();
         onChanged();
@@ -859,13 +837,10 @@ public Builder setMetadata(com.google.spanner.v1.ResultSetMetadata.Builder build
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public Builder mergeMetadata(com.google.spanner.v1.ResultSetMetadata value) {
+    public Builder mergeMetadata(ResultSetMetadata value) {
       if (metadataBuilder_ == null) {
         if (metadata_ != null) {
-          metadata_ =
-              com.google.spanner.v1.ResultSetMetadata.newBuilder(metadata_)
-                  .mergeFrom(value)
-                  .buildPartial();
+          metadata_ = ResultSetMetadata.newBuilder(metadata_).mergeFrom(value).buildPartial();
         } else {
           metadata_ = value;
         }
@@ -905,7 +880,7 @@ public Builder clearMetadata() {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public com.google.spanner.v1.ResultSetMetadata.Builder getMetadataBuilder() {
+    public ResultSetMetadata.Builder getMetadataBuilder() {
 
       onChanged();
       return getMetadataFieldBuilder().getBuilder();
@@ -919,13 +894,11 @@ public com.google.spanner.v1.ResultSetMetadata.Builder getMetadataBuilder() {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() {
+    public ResultSetMetadataOrBuilder getMetadataOrBuilder() {
       if (metadataBuilder_ != null) {
         return metadataBuilder_.getMessageOrBuilder();
       } else {
-        return metadata_ == null
-            ? com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()
-            : metadata_;
+        return metadata_ == null ? ResultSetMetadata.getDefaultInstance() : metadata_;
       }
     }
     /**
@@ -938,16 +911,12 @@ public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() {
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.ResultSetMetadata,
-            com.google.spanner.v1.ResultSetMetadata.Builder,
-            com.google.spanner.v1.ResultSetMetadataOrBuilder>
+            ResultSetMetadata, ResultSetMetadata.Builder, ResultSetMetadataOrBuilder>
         getMetadataFieldBuilder() {
       if (metadataBuilder_ == null) {
         metadataBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.ResultSetMetadata,
-                com.google.spanner.v1.ResultSetMetadata.Builder,
-                com.google.spanner.v1.ResultSetMetadataOrBuilder>(
+                ResultSetMetadata, ResultSetMetadata.Builder, ResultSetMetadataOrBuilder>(
                 getMetadata(), getParentForChildren(), isClean());
         metadata_ = null;
       }
@@ -1199,7 +1168,7 @@ public Builder addRows(int index, com.google.protobuf.ListValue.Builder builderF
      *
      * repeated .google.protobuf.ListValue rows = 2;
      */
-    public Builder addAllRows(java.lang.Iterable values) {
+    public Builder addAllRows(Iterable values) {
       if (rowsBuilder_ == null) {
         ensureRowsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, rows_);
@@ -1386,11 +1355,9 @@ public java.util.List getRowsBuilderList(
       return rowsBuilder_;
     }
 
-    private com.google.spanner.v1.ResultSetStats stats_;
+    private ResultSetStats stats_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.ResultSetStats,
-            com.google.spanner.v1.ResultSetStats.Builder,
-            com.google.spanner.v1.ResultSetStatsOrBuilder>
+            ResultSetStats, ResultSetStats.Builder, ResultSetStatsOrBuilder>
         statsBuilder_;
     /**
      *
@@ -1431,9 +1398,9 @@ public boolean hasStats() {
      *
      * @return The stats.
      */
-    public com.google.spanner.v1.ResultSetStats getStats() {
+    public ResultSetStats getStats() {
       if (statsBuilder_ == null) {
-        return stats_ == null ? com.google.spanner.v1.ResultSetStats.getDefaultInstance() : stats_;
+        return stats_ == null ? ResultSetStats.getDefaultInstance() : stats_;
       } else {
         return statsBuilder_.getMessage();
       }
@@ -1454,7 +1421,7 @@ public com.google.spanner.v1.ResultSetStats getStats() {
      *
      * .google.spanner.v1.ResultSetStats stats = 3;
      */
-    public Builder setStats(com.google.spanner.v1.ResultSetStats value) {
+    public Builder setStats(ResultSetStats value) {
       if (statsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1483,7 +1450,7 @@ public Builder setStats(com.google.spanner.v1.ResultSetStats value) {
      *
      * .google.spanner.v1.ResultSetStats stats = 3;
      */
-    public Builder setStats(com.google.spanner.v1.ResultSetStats.Builder builderForValue) {
+    public Builder setStats(ResultSetStats.Builder builderForValue) {
       if (statsBuilder_ == null) {
         stats_ = builderForValue.build();
         onChanged();
@@ -1509,13 +1476,10 @@ public Builder setStats(com.google.spanner.v1.ResultSetStats.Builder builderForV
      *
      * .google.spanner.v1.ResultSetStats stats = 3;
      */
-    public Builder mergeStats(com.google.spanner.v1.ResultSetStats value) {
+    public Builder mergeStats(ResultSetStats value) {
       if (statsBuilder_ == null) {
         if (stats_ != null) {
-          stats_ =
-              com.google.spanner.v1.ResultSetStats.newBuilder(stats_)
-                  .mergeFrom(value)
-                  .buildPartial();
+          stats_ = ResultSetStats.newBuilder(stats_).mergeFrom(value).buildPartial();
         } else {
           stats_ = value;
         }
@@ -1569,7 +1533,7 @@ public Builder clearStats() {
      *
      * .google.spanner.v1.ResultSetStats stats = 3;
      */
-    public com.google.spanner.v1.ResultSetStats.Builder getStatsBuilder() {
+    public ResultSetStats.Builder getStatsBuilder() {
 
       onChanged();
       return getStatsFieldBuilder().getBuilder();
@@ -1590,11 +1554,11 @@ public com.google.spanner.v1.ResultSetStats.Builder getStatsBuilder() {
      *
      * .google.spanner.v1.ResultSetStats stats = 3;
      */
-    public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
+    public ResultSetStatsOrBuilder getStatsOrBuilder() {
       if (statsBuilder_ != null) {
         return statsBuilder_.getMessageOrBuilder();
       } else {
-        return stats_ == null ? com.google.spanner.v1.ResultSetStats.getDefaultInstance() : stats_;
+        return stats_ == null ? ResultSetStats.getDefaultInstance() : stats_;
       }
     }
     /**
@@ -1614,28 +1578,24 @@ public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
      * .google.spanner.v1.ResultSetStats stats = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.ResultSetStats,
-            com.google.spanner.v1.ResultSetStats.Builder,
-            com.google.spanner.v1.ResultSetStatsOrBuilder>
+            ResultSetStats, ResultSetStats.Builder, ResultSetStatsOrBuilder>
         getStatsFieldBuilder() {
       if (statsBuilder_ == null) {
         statsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.ResultSetStats,
-                com.google.spanner.v1.ResultSetStats.Builder,
-                com.google.spanner.v1.ResultSetStatsOrBuilder>(
+                ResultSetStats, ResultSetStats.Builder, ResultSetStatsOrBuilder>(
                 getStats(), getParentForChildren(), isClean());
         stats_ = null;
       }
       return statsBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1645,19 +1605,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.ResultSet)
-  private static final com.google.spanner.v1.ResultSet DEFAULT_INSTANCE;
+  private static final ResultSet DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.ResultSet();
+    DEFAULT_INSTANCE = new ResultSet();
   }
 
-  public static com.google.spanner.v1.ResultSet getDefaultInstance() {
+  public static ResultSet getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public ResultSet parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1670,13 +1630,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.ResultSet getDefaultInstanceForType() {
+  @Override
+  public ResultSet getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java
index a9d3e4f45b..414ab9066d 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java
@@ -39,13 +39,13 @@ private ResultSetMetadata(com.google.protobuf.GeneratedMessageV3.Builder buil
 
   private ResultSetMetadata() {}
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new ResultSetMetadata();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -56,7 +56,7 @@ private ResultSetMetadata(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -70,12 +70,11 @@ private ResultSetMetadata(
             break;
           case 10:
             {
-              com.google.spanner.v1.StructType.Builder subBuilder = null;
+              StructType.Builder subBuilder = null;
               if (rowType_ != null) {
                 subBuilder = rowType_.toBuilder();
               }
-              rowType_ =
-                  input.readMessage(com.google.spanner.v1.StructType.parser(), extensionRegistry);
+              rowType_ = input.readMessage(StructType.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(rowType_);
                 rowType_ = subBuilder.buildPartial();
@@ -85,12 +84,11 @@ private ResultSetMetadata(
             }
           case 18:
             {
-              com.google.spanner.v1.Transaction.Builder subBuilder = null;
+              Transaction.Builder subBuilder = null;
               if (transaction_ != null) {
                 subBuilder = transaction_.toBuilder();
               }
-              transaction_ =
-                  input.readMessage(com.google.spanner.v1.Transaction.parser(), extensionRegistry);
+              transaction_ = input.readMessage(Transaction.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(transaction_);
                 transaction_ = subBuilder.buildPartial();
@@ -118,22 +116,17 @@ private ResultSetMetadata(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.ResultSetProto
-        .internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
+    return ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.ResultSetProto
-        .internal_static_google_spanner_v1_ResultSetMetadata_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.ResultSetMetadata.class,
-            com.google.spanner.v1.ResultSetMetadata.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(ResultSetMetadata.class, Builder.class);
   }
 
   public static final int ROW_TYPE_FIELD_NUMBER = 1;
-  private com.google.spanner.v1.StructType rowType_;
+  private StructType rowType_;
   /**
    *
    *
@@ -151,7 +144,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the rowType field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasRowType() {
     return rowType_ != null;
   }
@@ -172,9 +165,9 @@ public boolean hasRowType() {
    *
    * @return The rowType.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.StructType getRowType() {
-    return rowType_ == null ? com.google.spanner.v1.StructType.getDefaultInstance() : rowType_;
+  @Override
+  public StructType getRowType() {
+    return rowType_ == null ? StructType.getDefaultInstance() : rowType_;
   }
   /**
    *
@@ -191,13 +184,13 @@ public com.google.spanner.v1.StructType getRowType() {
    *
    * .google.spanner.v1.StructType row_type = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.StructTypeOrBuilder getRowTypeOrBuilder() {
+  @Override
+  public StructTypeOrBuilder getRowTypeOrBuilder() {
     return getRowType();
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 2;
-  private com.google.spanner.v1.Transaction transaction_;
+  private Transaction transaction_;
   /**
    *
    *
@@ -210,7 +203,7 @@ public com.google.spanner.v1.StructTypeOrBuilder getRowTypeOrBuilder() {
    *
    * @return Whether the transaction field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasTransaction() {
     return transaction_ != null;
   }
@@ -226,11 +219,9 @@ public boolean hasTransaction() {
    *
    * @return The transaction.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Transaction getTransaction() {
-    return transaction_ == null
-        ? com.google.spanner.v1.Transaction.getDefaultInstance()
-        : transaction_;
+  @Override
+  public Transaction getTransaction() {
+    return transaction_ == null ? Transaction.getDefaultInstance() : transaction_;
   }
   /**
    *
@@ -242,14 +233,14 @@ public com.google.spanner.v1.Transaction getTransaction() {
    *
    * .google.spanner.v1.Transaction transaction = 2;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
+  @Override
+  public TransactionOrBuilder getTransactionOrBuilder() {
     return getTransaction();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -259,7 +250,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (rowType_ != null) {
       output.writeMessage(1, getRowType());
@@ -270,7 +261,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -287,15 +278,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.ResultSetMetadata)) {
+    if (!(obj instanceof ResultSetMetadata)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.ResultSetMetadata other = (com.google.spanner.v1.ResultSetMetadata) obj;
+    ResultSetMetadata other = (ResultSetMetadata) obj;
 
     if (hasRowType() != other.hasRowType()) return false;
     if (hasRowType()) {
@@ -309,7 +300,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -329,71 +320,69 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.ResultSetMetadata parseFrom(java.nio.ByteBuffer data)
+  public static ResultSetMetadata parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ResultSetMetadata parseFrom(
+  public static ResultSetMetadata parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.ResultSetMetadata parseFrom(
-      com.google.protobuf.ByteString data)
+  public static ResultSetMetadata parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ResultSetMetadata parseFrom(
+  public static ResultSetMetadata 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.spanner.v1.ResultSetMetadata parseFrom(byte[] data)
+  public static ResultSetMetadata parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ResultSetMetadata parseFrom(
+  public static ResultSetMetadata parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.ResultSetMetadata parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static ResultSetMetadata parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ResultSetMetadata parseFrom(
+  public static ResultSetMetadata 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.spanner.v1.ResultSetMetadata parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
+  public static ResultSetMetadata parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ResultSetMetadata parseDelimitedFrom(
+  public static ResultSetMetadata 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.spanner.v1.ResultSetMetadata parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static ResultSetMetadata parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ResultSetMetadata parseFrom(
+  public static ResultSetMetadata parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -401,7 +390,7 @@ public static com.google.spanner.v1.ResultSetMetadata parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -410,17 +399,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.ResultSetMetadata prototype) {
+  public static Builder newBuilder(ResultSetMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -436,20 +425,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.ResultSetMetadata)
-      com.google.spanner.v1.ResultSetMetadataOrBuilder {
+      ResultSetMetadataOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.ResultSetProto
-          .internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
+      return ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.ResultSetProto
-          .internal_static_google_spanner_v1_ResultSetMetadata_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.ResultSetMetadata.class,
-              com.google.spanner.v1.ResultSetMetadata.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(ResultSetMetadata.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.ResultSetMetadata.newBuilder()
@@ -457,7 +441,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -466,7 +450,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       if (rowTypeBuilder_ == null) {
@@ -484,30 +468,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.ResultSetProto
-          .internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
+      return ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ResultSetMetadata getDefaultInstanceForType() {
-      return com.google.spanner.v1.ResultSetMetadata.getDefaultInstance();
+    @Override
+    public ResultSetMetadata getDefaultInstanceForType() {
+      return ResultSetMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ResultSetMetadata build() {
-      com.google.spanner.v1.ResultSetMetadata result = buildPartial();
+    @Override
+    public ResultSetMetadata build() {
+      ResultSetMetadata result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ResultSetMetadata buildPartial() {
-      com.google.spanner.v1.ResultSetMetadata result =
-          new com.google.spanner.v1.ResultSetMetadata(this);
+    @Override
+    public ResultSetMetadata buildPartial() {
+      ResultSetMetadata result = new ResultSetMetadata(this);
       if (rowTypeBuilder_ == null) {
         result.rowType_ = rowType_;
       } else {
@@ -522,51 +504,50 @@ public com.google.spanner.v1.ResultSetMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.ResultSetMetadata) {
-        return mergeFrom((com.google.spanner.v1.ResultSetMetadata) other);
+      if (other instanceof ResultSetMetadata) {
+        return mergeFrom((ResultSetMetadata) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.ResultSetMetadata other) {
-      if (other == com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()) return this;
+    public Builder mergeFrom(ResultSetMetadata other) {
+      if (other == ResultSetMetadata.getDefaultInstance()) return this;
       if (other.hasRowType()) {
         mergeRowType(other.getRowType());
       }
@@ -578,21 +559,21 @@ public Builder mergeFrom(com.google.spanner.v1.ResultSetMetadata other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.ResultSetMetadata parsedMessage = null;
+      ResultSetMetadata parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.ResultSetMetadata) e.getUnfinishedMessage();
+        parsedMessage = (ResultSetMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -602,11 +583,9 @@ public Builder mergeFrom(
       return this;
     }
 
-    private com.google.spanner.v1.StructType rowType_;
+    private StructType rowType_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.StructType,
-            com.google.spanner.v1.StructType.Builder,
-            com.google.spanner.v1.StructTypeOrBuilder>
+            StructType, StructType.Builder, StructTypeOrBuilder>
         rowTypeBuilder_;
     /**
      *
@@ -645,9 +624,9 @@ public boolean hasRowType() {
      *
      * @return The rowType.
      */
-    public com.google.spanner.v1.StructType getRowType() {
+    public StructType getRowType() {
       if (rowTypeBuilder_ == null) {
-        return rowType_ == null ? com.google.spanner.v1.StructType.getDefaultInstance() : rowType_;
+        return rowType_ == null ? StructType.getDefaultInstance() : rowType_;
       } else {
         return rowTypeBuilder_.getMessage();
       }
@@ -667,7 +646,7 @@ public com.google.spanner.v1.StructType getRowType() {
      *
      * .google.spanner.v1.StructType row_type = 1;
      */
-    public Builder setRowType(com.google.spanner.v1.StructType value) {
+    public Builder setRowType(StructType value) {
       if (rowTypeBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -695,7 +674,7 @@ public Builder setRowType(com.google.spanner.v1.StructType value) {
      *
      * .google.spanner.v1.StructType row_type = 1;
      */
-    public Builder setRowType(com.google.spanner.v1.StructType.Builder builderForValue) {
+    public Builder setRowType(StructType.Builder builderForValue) {
       if (rowTypeBuilder_ == null) {
         rowType_ = builderForValue.build();
         onChanged();
@@ -720,11 +699,10 @@ public Builder setRowType(com.google.spanner.v1.StructType.Builder builderForVal
      *
      * .google.spanner.v1.StructType row_type = 1;
      */
-    public Builder mergeRowType(com.google.spanner.v1.StructType value) {
+    public Builder mergeRowType(StructType value) {
       if (rowTypeBuilder_ == null) {
         if (rowType_ != null) {
-          rowType_ =
-              com.google.spanner.v1.StructType.newBuilder(rowType_).mergeFrom(value).buildPartial();
+          rowType_ = StructType.newBuilder(rowType_).mergeFrom(value).buildPartial();
         } else {
           rowType_ = value;
         }
@@ -776,7 +754,7 @@ public Builder clearRowType() {
      *
      * .google.spanner.v1.StructType row_type = 1;
      */
-    public com.google.spanner.v1.StructType.Builder getRowTypeBuilder() {
+    public StructType.Builder getRowTypeBuilder() {
 
       onChanged();
       return getRowTypeFieldBuilder().getBuilder();
@@ -796,11 +774,11 @@ public com.google.spanner.v1.StructType.Builder getRowTypeBuilder() {
      *
      * .google.spanner.v1.StructType row_type = 1;
      */
-    public com.google.spanner.v1.StructTypeOrBuilder getRowTypeOrBuilder() {
+    public StructTypeOrBuilder getRowTypeOrBuilder() {
       if (rowTypeBuilder_ != null) {
         return rowTypeBuilder_.getMessageOrBuilder();
       } else {
-        return rowType_ == null ? com.google.spanner.v1.StructType.getDefaultInstance() : rowType_;
+        return rowType_ == null ? StructType.getDefaultInstance() : rowType_;
       }
     }
     /**
@@ -819,27 +797,21 @@ public com.google.spanner.v1.StructTypeOrBuilder getRowTypeOrBuilder() {
      * .google.spanner.v1.StructType row_type = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.StructType,
-            com.google.spanner.v1.StructType.Builder,
-            com.google.spanner.v1.StructTypeOrBuilder>
+            StructType, StructType.Builder, StructTypeOrBuilder>
         getRowTypeFieldBuilder() {
       if (rowTypeBuilder_ == null) {
         rowTypeBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.StructType,
-                com.google.spanner.v1.StructType.Builder,
-                com.google.spanner.v1.StructTypeOrBuilder>(
+                StructType, StructType.Builder, StructTypeOrBuilder>(
                 getRowType(), getParentForChildren(), isClean());
         rowType_ = null;
       }
       return rowTypeBuilder_;
     }
 
-    private com.google.spanner.v1.Transaction transaction_;
+    private Transaction transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Transaction,
-            com.google.spanner.v1.Transaction.Builder,
-            com.google.spanner.v1.TransactionOrBuilder>
+            Transaction, Transaction.Builder, TransactionOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -868,11 +840,9 @@ public boolean hasTransaction() {
      *
      * @return The transaction.
      */
-    public com.google.spanner.v1.Transaction getTransaction() {
+    public Transaction getTransaction() {
       if (transactionBuilder_ == null) {
-        return transaction_ == null
-            ? com.google.spanner.v1.Transaction.getDefaultInstance()
-            : transaction_;
+        return transaction_ == null ? Transaction.getDefaultInstance() : transaction_;
       } else {
         return transactionBuilder_.getMessage();
       }
@@ -887,7 +857,7 @@ public com.google.spanner.v1.Transaction getTransaction() {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Builder setTransaction(com.google.spanner.v1.Transaction value) {
+    public Builder setTransaction(Transaction value) {
       if (transactionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -910,7 +880,7 @@ public Builder setTransaction(com.google.spanner.v1.Transaction value) {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Builder setTransaction(com.google.spanner.v1.Transaction.Builder builderForValue) {
+    public Builder setTransaction(Transaction.Builder builderForValue) {
       if (transactionBuilder_ == null) {
         transaction_ = builderForValue.build();
         onChanged();
@@ -930,13 +900,10 @@ public Builder setTransaction(com.google.spanner.v1.Transaction.Builder builderF
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Builder mergeTransaction(com.google.spanner.v1.Transaction value) {
+    public Builder mergeTransaction(Transaction value) {
       if (transactionBuilder_ == null) {
         if (transaction_ != null) {
-          transaction_ =
-              com.google.spanner.v1.Transaction.newBuilder(transaction_)
-                  .mergeFrom(value)
-                  .buildPartial();
+          transaction_ = Transaction.newBuilder(transaction_).mergeFrom(value).buildPartial();
         } else {
           transaction_ = value;
         }
@@ -978,7 +945,7 @@ public Builder clearTransaction() {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public com.google.spanner.v1.Transaction.Builder getTransactionBuilder() {
+    public Transaction.Builder getTransactionBuilder() {
 
       onChanged();
       return getTransactionFieldBuilder().getBuilder();
@@ -993,13 +960,11 @@ public com.google.spanner.v1.Transaction.Builder getTransactionBuilder() {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
+    public TransactionOrBuilder getTransactionOrBuilder() {
       if (transactionBuilder_ != null) {
         return transactionBuilder_.getMessageOrBuilder();
       } else {
-        return transaction_ == null
-            ? com.google.spanner.v1.Transaction.getDefaultInstance()
-            : transaction_;
+        return transaction_ == null ? Transaction.getDefaultInstance() : transaction_;
       }
     }
     /**
@@ -1013,28 +978,24 @@ public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
      * .google.spanner.v1.Transaction transaction = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Transaction,
-            com.google.spanner.v1.Transaction.Builder,
-            com.google.spanner.v1.TransactionOrBuilder>
+            Transaction, Transaction.Builder, TransactionOrBuilder>
         getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.Transaction,
-                com.google.spanner.v1.Transaction.Builder,
-                com.google.spanner.v1.TransactionOrBuilder>(
+                Transaction, Transaction.Builder, TransactionOrBuilder>(
                 getTransaction(), getParentForChildren(), isClean());
         transaction_ = null;
       }
       return transactionBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1044,19 +1005,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.ResultSetMetadata)
-  private static final com.google.spanner.v1.ResultSetMetadata DEFAULT_INSTANCE;
+  private static final ResultSetMetadata DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.ResultSetMetadata();
+    DEFAULT_INSTANCE = new ResultSetMetadata();
   }
 
-  public static com.google.spanner.v1.ResultSetMetadata getDefaultInstance() {
+  public static ResultSetMetadata getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public ResultSetMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1069,13 +1030,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.ResultSetMetadata getDefaultInstanceForType() {
+  @Override
+  public ResultSetMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadataOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadataOrBuilder.java
index e1a554096f..64ef83de88 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadataOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadataOrBuilder.java
@@ -58,7 +58,7 @@ public interface ResultSetMetadataOrBuilder
    *
    * @return The rowType.
    */
-  com.google.spanner.v1.StructType getRowType();
+  StructType getRowType();
   /**
    *
    *
@@ -74,7 +74,7 @@ public interface ResultSetMetadataOrBuilder
    *
    * .google.spanner.v1.StructType row_type = 1;
    */
-  com.google.spanner.v1.StructTypeOrBuilder getRowTypeOrBuilder();
+  StructTypeOrBuilder getRowTypeOrBuilder();
 
   /**
    *
@@ -101,7 +101,7 @@ public interface ResultSetMetadataOrBuilder
    *
    * @return The transaction.
    */
-  com.google.spanner.v1.Transaction getTransaction();
+  Transaction getTransaction();
   /**
    *
    *
@@ -112,5 +112,5 @@ public interface ResultSetMetadataOrBuilder
    *
    * .google.spanner.v1.Transaction transaction = 2;
    */
-  com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder();
+  TransactionOrBuilder getTransactionOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetOrBuilder.java
index 81a2f13afd..11d76aec5d 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetOrBuilder.java
@@ -46,7 +46,7 @@ public interface ResultSetOrBuilder
    *
    * @return The metadata.
    */
-  com.google.spanner.v1.ResultSetMetadata getMetadata();
+  ResultSetMetadata getMetadata();
   /**
    *
    *
@@ -56,7 +56,7 @@ public interface ResultSetOrBuilder
    *
    * .google.spanner.v1.ResultSetMetadata metadata = 1;
    */
-  com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder();
+  ResultSetMetadataOrBuilder getMetadataOrBuilder();
 
   /**
    *
@@ -171,7 +171,7 @@ public interface ResultSetOrBuilder
    *
    * @return The stats.
    */
-  com.google.spanner.v1.ResultSetStats getStats();
+  ResultSetStats getStats();
   /**
    *
    *
@@ -188,5 +188,5 @@ public interface ResultSetOrBuilder
    *
    * .google.spanner.v1.ResultSetStats stats = 3;
    */
-  com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder();
+  ResultSetStatsOrBuilder getStatsOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java
index 48157af205..9adad1aa4d 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java
@@ -51,7 +51,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
   static {
-    java.lang.String[] descriptorData = {
+    String[] descriptorData = {
       "\n\"google/spanner/v1/result_set.proto\022\021go"
           + "ogle.spanner.v1\032\034google/protobuf/struct."
           + "proto\032\"google/spanner/v1/query_plan.prot"
@@ -86,9 +86,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.protobuf.StructProto.getDescriptor(),
-              com.google.spanner.v1.QueryPlanProto.getDescriptor(),
-              com.google.spanner.v1.TransactionProto.getDescriptor(),
-              com.google.spanner.v1.TypeProto.getDescriptor(),
+              QueryPlanProto.getDescriptor(),
+              TransactionProto.getDescriptor(),
+              TypeProto.getDescriptor(),
               com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_spanner_v1_ResultSet_descriptor =
@@ -96,7 +96,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_ResultSet_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_ResultSet_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Metadata", "Rows", "Stats",
             });
     internal_static_google_spanner_v1_PartialResultSet_descriptor =
@@ -104,7 +104,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_PartialResultSet_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_PartialResultSet_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Metadata", "Values", "ChunkedValue", "ResumeToken", "Stats",
             });
     internal_static_google_spanner_v1_ResultSetMetadata_descriptor =
@@ -112,7 +112,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_ResultSetMetadata_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_ResultSetMetadata_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "RowType", "Transaction",
             });
     internal_static_google_spanner_v1_ResultSetStats_descriptor =
@@ -120,13 +120,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_ResultSetStats_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_ResultSetStats_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "QueryPlan", "QueryStats", "RowCountExact", "RowCountLowerBound", "RowCount",
             });
     com.google.protobuf.StructProto.getDescriptor();
-    com.google.spanner.v1.QueryPlanProto.getDescriptor();
-    com.google.spanner.v1.TransactionProto.getDescriptor();
-    com.google.spanner.v1.TypeProto.getDescriptor();
+    QueryPlanProto.getDescriptor();
+    TransactionProto.getDescriptor();
+    TypeProto.getDescriptor();
     com.google.api.AnnotationsProto.getDescriptor();
   }
 
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java
index cbd9063c37..dc085e3fe8 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java
@@ -39,13 +39,13 @@ private ResultSetStats(com.google.protobuf.GeneratedMessageV3.Builder builder
 
   private ResultSetStats() {}
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new ResultSetStats();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -56,7 +56,7 @@ private ResultSetStats(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -70,12 +70,11 @@ private ResultSetStats(
             break;
           case 10:
             {
-              com.google.spanner.v1.QueryPlan.Builder subBuilder = null;
+              QueryPlan.Builder subBuilder = null;
               if (queryPlan_ != null) {
                 subBuilder = queryPlan_.toBuilder();
               }
-              queryPlan_ =
-                  input.readMessage(com.google.spanner.v1.QueryPlan.parser(), extensionRegistry);
+              queryPlan_ = input.readMessage(QueryPlan.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(queryPlan_);
                 queryPlan_ = subBuilder.buildPartial();
@@ -130,27 +129,19 @@ private ResultSetStats(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.ResultSetProto
-        .internal_static_google_spanner_v1_ResultSetStats_descriptor;
+    return ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.ResultSetProto
-        .internal_static_google_spanner_v1_ResultSetStats_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.ResultSetStats.class,
-            com.google.spanner.v1.ResultSetStats.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(ResultSetStats.class, Builder.class);
   }
 
   private int rowCountCase_ = 0;
-  private java.lang.Object rowCount_;
+  private Object rowCount_;
 
-  public enum RowCountCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
-          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+  public enum RowCountCase implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
     ROW_COUNT_EXACT(3),
     ROW_COUNT_LOWER_BOUND(4),
     ROWCOUNT_NOT_SET(0);
@@ -164,7 +155,7 @@ private RowCountCase(int value) {
      * @return The enum associated with the given number.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @java.lang.Deprecated
+    @Deprecated
     public static RowCountCase valueOf(int value) {
       return forNumber(value);
     }
@@ -192,7 +183,7 @@ public RowCountCase getRowCountCase() {
   }
 
   public static final int QUERY_PLAN_FIELD_NUMBER = 1;
-  private com.google.spanner.v1.QueryPlan queryPlan_;
+  private QueryPlan queryPlan_;
   /**
    *
    *
@@ -204,7 +195,7 @@ public RowCountCase getRowCountCase() {
    *
    * @return Whether the queryPlan field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasQueryPlan() {
     return queryPlan_ != null;
   }
@@ -219,9 +210,9 @@ public boolean hasQueryPlan() {
    *
    * @return The queryPlan.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.QueryPlan getQueryPlan() {
-    return queryPlan_ == null ? com.google.spanner.v1.QueryPlan.getDefaultInstance() : queryPlan_;
+  @Override
+  public QueryPlan getQueryPlan() {
+    return queryPlan_ == null ? QueryPlan.getDefaultInstance() : queryPlan_;
   }
   /**
    *
@@ -232,8 +223,8 @@ public com.google.spanner.v1.QueryPlan getQueryPlan() {
    *
    * .google.spanner.v1.QueryPlan query_plan = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.QueryPlanOrBuilder getQueryPlanOrBuilder() {
+  @Override
+  public QueryPlanOrBuilder getQueryPlanOrBuilder() {
     return getQueryPlan();
   }
 
@@ -257,7 +248,7 @@ public com.google.spanner.v1.QueryPlanOrBuilder getQueryPlanOrBuilder() {
    *
    * @return Whether the queryStats field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasQueryStats() {
     return queryStats_ != null;
   }
@@ -279,7 +270,7 @@ public boolean hasQueryStats() {
    *
    * @return The queryStats.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Struct getQueryStats() {
     return queryStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : queryStats_;
   }
@@ -299,7 +290,7 @@ public com.google.protobuf.Struct getQueryStats() {
    *
    * .google.protobuf.Struct query_stats = 2;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.StructOrBuilder getQueryStatsOrBuilder() {
     return getQueryStats();
   }
@@ -331,10 +322,10 @@ public boolean hasRowCountExact() {
    *
    * @return The rowCountExact.
    */
-  @java.lang.Override
+  @Override
   public long getRowCountExact() {
     if (rowCountCase_ == 3) {
-      return (java.lang.Long) rowCount_;
+      return (Long) rowCount_;
     }
     return 0L;
   }
@@ -368,17 +359,17 @@ public boolean hasRowCountLowerBound() {
    *
    * @return The rowCountLowerBound.
    */
-  @java.lang.Override
+  @Override
   public long getRowCountLowerBound() {
     if (rowCountCase_ == 4) {
-      return (java.lang.Long) rowCount_;
+      return (Long) rowCount_;
     }
     return 0L;
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -388,7 +379,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (queryPlan_ != null) {
       output.writeMessage(1, getQueryPlan());
@@ -397,15 +388,15 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       output.writeMessage(2, getQueryStats());
     }
     if (rowCountCase_ == 3) {
-      output.writeInt64(3, (long) ((java.lang.Long) rowCount_));
+      output.writeInt64(3, (long) ((Long) rowCount_));
     }
     if (rowCountCase_ == 4) {
-      output.writeInt64(4, (long) ((java.lang.Long) rowCount_));
+      output.writeInt64(4, (long) ((Long) rowCount_));
     }
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -418,29 +409,25 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQueryStats());
     }
     if (rowCountCase_ == 3) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeInt64Size(
-              3, (long) ((java.lang.Long) rowCount_));
+      size += com.google.protobuf.CodedOutputStream.computeInt64Size(3, (long) ((Long) rowCount_));
     }
     if (rowCountCase_ == 4) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeInt64Size(
-              4, (long) ((java.lang.Long) rowCount_));
+      size += com.google.protobuf.CodedOutputStream.computeInt64Size(4, (long) ((Long) rowCount_));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.ResultSetStats)) {
+    if (!(obj instanceof ResultSetStats)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.ResultSetStats other = (com.google.spanner.v1.ResultSetStats) obj;
+    ResultSetStats other = (ResultSetStats) obj;
 
     if (hasQueryPlan() != other.hasQueryPlan()) return false;
     if (hasQueryPlan()) {
@@ -465,7 +452,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -497,70 +484,69 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.ResultSetStats parseFrom(java.nio.ByteBuffer data)
+  public static ResultSetStats parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ResultSetStats parseFrom(
+  public static ResultSetStats parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.ResultSetStats parseFrom(com.google.protobuf.ByteString data)
+  public static ResultSetStats parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ResultSetStats parseFrom(
+  public static ResultSetStats 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.spanner.v1.ResultSetStats parseFrom(byte[] data)
+  public static ResultSetStats parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.ResultSetStats parseFrom(
+  public static ResultSetStats parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.ResultSetStats parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static ResultSetStats parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ResultSetStats parseFrom(
+  public static ResultSetStats 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.spanner.v1.ResultSetStats parseDelimitedFrom(java.io.InputStream input)
+  public static ResultSetStats parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ResultSetStats parseDelimitedFrom(
+  public static ResultSetStats 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.spanner.v1.ResultSetStats parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static ResultSetStats parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.ResultSetStats parseFrom(
+  public static ResultSetStats parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -568,7 +554,7 @@ public static com.google.spanner.v1.ResultSetStats parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -577,17 +563,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.ResultSetStats prototype) {
+  public static Builder newBuilder(ResultSetStats prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -603,20 +589,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.ResultSetStats)
-      com.google.spanner.v1.ResultSetStatsOrBuilder {
+      ResultSetStatsOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.ResultSetProto
-          .internal_static_google_spanner_v1_ResultSetStats_descriptor;
+      return ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.ResultSetProto
-          .internal_static_google_spanner_v1_ResultSetStats_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.ResultSetStats.class,
-              com.google.spanner.v1.ResultSetStats.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(ResultSetStats.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.ResultSetStats.newBuilder()
@@ -624,7 +605,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -633,7 +614,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       if (queryPlanBuilder_ == null) {
@@ -653,29 +634,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.ResultSetProto
-          .internal_static_google_spanner_v1_ResultSetStats_descriptor;
+      return ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ResultSetStats getDefaultInstanceForType() {
-      return com.google.spanner.v1.ResultSetStats.getDefaultInstance();
+    @Override
+    public ResultSetStats getDefaultInstanceForType() {
+      return ResultSetStats.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ResultSetStats build() {
-      com.google.spanner.v1.ResultSetStats result = buildPartial();
+    @Override
+    public ResultSetStats build() {
+      ResultSetStats result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.ResultSetStats buildPartial() {
-      com.google.spanner.v1.ResultSetStats result = new com.google.spanner.v1.ResultSetStats(this);
+    @Override
+    public ResultSetStats buildPartial() {
+      ResultSetStats result = new ResultSetStats(this);
       if (queryPlanBuilder_ == null) {
         result.queryPlan_ = queryPlan_;
       } else {
@@ -697,51 +677,50 @@ public com.google.spanner.v1.ResultSetStats buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.ResultSetStats) {
-        return mergeFrom((com.google.spanner.v1.ResultSetStats) other);
+      if (other instanceof ResultSetStats) {
+        return mergeFrom((ResultSetStats) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.ResultSetStats other) {
-      if (other == com.google.spanner.v1.ResultSetStats.getDefaultInstance()) return this;
+    public Builder mergeFrom(ResultSetStats other) {
+      if (other == ResultSetStats.getDefaultInstance()) return this;
       if (other.hasQueryPlan()) {
         mergeQueryPlan(other.getQueryPlan());
       }
@@ -769,21 +748,21 @@ public Builder mergeFrom(com.google.spanner.v1.ResultSetStats other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.ResultSetStats parsedMessage = null;
+      ResultSetStats parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.ResultSetStats) e.getUnfinishedMessage();
+        parsedMessage = (ResultSetStats) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -794,7 +773,7 @@ public Builder mergeFrom(
     }
 
     private int rowCountCase_ = 0;
-    private java.lang.Object rowCount_;
+    private Object rowCount_;
 
     public RowCountCase getRowCountCase() {
       return RowCountCase.forNumber(rowCountCase_);
@@ -807,11 +786,9 @@ public Builder clearRowCount() {
       return this;
     }
 
-    private com.google.spanner.v1.QueryPlan queryPlan_;
+    private QueryPlan queryPlan_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.QueryPlan,
-            com.google.spanner.v1.QueryPlan.Builder,
-            com.google.spanner.v1.QueryPlanOrBuilder>
+            QueryPlan, QueryPlan.Builder, QueryPlanOrBuilder>
         queryPlanBuilder_;
     /**
      *
@@ -838,11 +815,9 @@ public boolean hasQueryPlan() {
      *
      * @return The queryPlan.
      */
-    public com.google.spanner.v1.QueryPlan getQueryPlan() {
+    public QueryPlan getQueryPlan() {
       if (queryPlanBuilder_ == null) {
-        return queryPlan_ == null
-            ? com.google.spanner.v1.QueryPlan.getDefaultInstance()
-            : queryPlan_;
+        return queryPlan_ == null ? QueryPlan.getDefaultInstance() : queryPlan_;
       } else {
         return queryPlanBuilder_.getMessage();
       }
@@ -856,7 +831,7 @@ public com.google.spanner.v1.QueryPlan getQueryPlan() {
      *
      * .google.spanner.v1.QueryPlan query_plan = 1;
      */
-    public Builder setQueryPlan(com.google.spanner.v1.QueryPlan value) {
+    public Builder setQueryPlan(QueryPlan value) {
       if (queryPlanBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -878,7 +853,7 @@ public Builder setQueryPlan(com.google.spanner.v1.QueryPlan value) {
      *
      * .google.spanner.v1.QueryPlan query_plan = 1;
      */
-    public Builder setQueryPlan(com.google.spanner.v1.QueryPlan.Builder builderForValue) {
+    public Builder setQueryPlan(QueryPlan.Builder builderForValue) {
       if (queryPlanBuilder_ == null) {
         queryPlan_ = builderForValue.build();
         onChanged();
@@ -897,13 +872,10 @@ public Builder setQueryPlan(com.google.spanner.v1.QueryPlan.Builder builderForVa
      *
      * .google.spanner.v1.QueryPlan query_plan = 1;
      */
-    public Builder mergeQueryPlan(com.google.spanner.v1.QueryPlan value) {
+    public Builder mergeQueryPlan(QueryPlan value) {
       if (queryPlanBuilder_ == null) {
         if (queryPlan_ != null) {
-          queryPlan_ =
-              com.google.spanner.v1.QueryPlan.newBuilder(queryPlan_)
-                  .mergeFrom(value)
-                  .buildPartial();
+          queryPlan_ = QueryPlan.newBuilder(queryPlan_).mergeFrom(value).buildPartial();
         } else {
           queryPlan_ = value;
         }
@@ -943,7 +915,7 @@ public Builder clearQueryPlan() {
      *
      * .google.spanner.v1.QueryPlan query_plan = 1;
      */
-    public com.google.spanner.v1.QueryPlan.Builder getQueryPlanBuilder() {
+    public QueryPlan.Builder getQueryPlanBuilder() {
 
       onChanged();
       return getQueryPlanFieldBuilder().getBuilder();
@@ -957,13 +929,11 @@ public com.google.spanner.v1.QueryPlan.Builder getQueryPlanBuilder() {
      *
      * .google.spanner.v1.QueryPlan query_plan = 1;
      */
-    public com.google.spanner.v1.QueryPlanOrBuilder getQueryPlanOrBuilder() {
+    public QueryPlanOrBuilder getQueryPlanOrBuilder() {
       if (queryPlanBuilder_ != null) {
         return queryPlanBuilder_.getMessageOrBuilder();
       } else {
-        return queryPlan_ == null
-            ? com.google.spanner.v1.QueryPlan.getDefaultInstance()
-            : queryPlan_;
+        return queryPlan_ == null ? QueryPlan.getDefaultInstance() : queryPlan_;
       }
     }
     /**
@@ -976,16 +946,12 @@ public com.google.spanner.v1.QueryPlanOrBuilder getQueryPlanOrBuilder() {
      * .google.spanner.v1.QueryPlan query_plan = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.QueryPlan,
-            com.google.spanner.v1.QueryPlan.Builder,
-            com.google.spanner.v1.QueryPlanOrBuilder>
+            QueryPlan, QueryPlan.Builder, QueryPlanOrBuilder>
         getQueryPlanFieldBuilder() {
       if (queryPlanBuilder_ == null) {
         queryPlanBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.QueryPlan,
-                com.google.spanner.v1.QueryPlan.Builder,
-                com.google.spanner.v1.QueryPlanOrBuilder>(
+                QueryPlan, QueryPlan.Builder, QueryPlanOrBuilder>(
                 getQueryPlan(), getParentForChildren(), isClean());
         queryPlan_ = null;
       }
@@ -1261,7 +1227,7 @@ public boolean hasRowCountExact() {
      */
     public long getRowCountExact() {
       if (rowCountCase_ == 3) {
-        return (java.lang.Long) rowCount_;
+        return (Long) rowCount_;
       }
       return 0L;
     }
@@ -1332,7 +1298,7 @@ public boolean hasRowCountLowerBound() {
      */
     public long getRowCountLowerBound() {
       if (rowCountCase_ == 4) {
-        return (java.lang.Long) rowCount_;
+        return (Long) rowCount_;
       }
       return 0L;
     }
@@ -1376,12 +1342,12 @@ public Builder clearRowCountLowerBound() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1391,19 +1357,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.ResultSetStats)
-  private static final com.google.spanner.v1.ResultSetStats DEFAULT_INSTANCE;
+  private static final ResultSetStats DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.ResultSetStats();
+    DEFAULT_INSTANCE = new ResultSetStats();
   }
 
-  public static com.google.spanner.v1.ResultSetStats getDefaultInstance() {
+  public static ResultSetStats getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public ResultSetStats parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1416,13 +1382,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.ResultSetStats getDefaultInstanceForType() {
+  @Override
+  public ResultSetStats getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStatsOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStatsOrBuilder.java
index 9a01e754b4..3de5bd1ded 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStatsOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStatsOrBuilder.java
@@ -46,7 +46,7 @@ public interface ResultSetStatsOrBuilder
    *
    * @return The queryPlan.
    */
-  com.google.spanner.v1.QueryPlan getQueryPlan();
+  QueryPlan getQueryPlan();
   /**
    *
    *
@@ -56,7 +56,7 @@ public interface ResultSetStatsOrBuilder
    *
    * .google.spanner.v1.QueryPlan query_plan = 1;
    */
-  com.google.spanner.v1.QueryPlanOrBuilder getQueryPlanOrBuilder();
+  QueryPlanOrBuilder getQueryPlanOrBuilder();
 
   /**
    *
@@ -166,5 +166,5 @@ public interface ResultSetStatsOrBuilder
    */
   long getRowCountLowerBound();
 
-  public com.google.spanner.v1.ResultSetStats.RowCountCase getRowCountCase();
+  public ResultSetStats.RowCountCase getRowCountCase();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java
index 93a40a3950..9eee022683 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java
@@ -42,13 +42,13 @@ private RollbackRequest() {
     transactionId_ = com.google.protobuf.ByteString.EMPTY;
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new RollbackRequest();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private RollbackRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -73,7 +73,7 @@ private RollbackRequest(
             break;
           case 10:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               session_ = s;
               break;
@@ -103,22 +103,17 @@ private RollbackRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_RollbackRequest_descriptor;
+    return SpannerProto.internal_static_google_spanner_v1_RollbackRequest_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_RollbackRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.RollbackRequest.class,
-            com.google.spanner.v1.RollbackRequest.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return SpannerProto.internal_static_google_spanner_v1_RollbackRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(RollbackRequest.class, Builder.class);
   }
 
   public static final int SESSION_FIELD_NUMBER = 1;
-  private volatile java.lang.Object session_;
+  private volatile Object session_;
   /**
    *
    *
@@ -132,14 +127,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The session.
    */
-  @java.lang.Override
-  public java.lang.String getSession() {
-    java.lang.Object ref = session_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getSession() {
+    Object ref = session_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       session_ = s;
       return s;
     }
@@ -157,12 +152,11 @@ public java.lang.String getSession() {
    *
    * @return The bytes for session.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ByteString getSessionBytes() {
-    java.lang.Object ref = session_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+    Object ref = session_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       session_ = b;
       return b;
     } else {
@@ -183,14 +177,14 @@ public com.google.protobuf.ByteString getSessionBytes() {
    *
    * @return The transactionId.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ByteString getTransactionId() {
     return transactionId_;
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -200,7 +194,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, session_);
@@ -211,7 +205,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -228,15 +222,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.RollbackRequest)) {
+    if (!(obj instanceof RollbackRequest)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.RollbackRequest other = (com.google.spanner.v1.RollbackRequest) obj;
+    RollbackRequest other = (RollbackRequest) obj;
 
     if (!getSession().equals(other.getSession())) return false;
     if (!getTransactionId().equals(other.getTransactionId())) return false;
@@ -244,7 +238,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -260,70 +254,69 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.RollbackRequest parseFrom(java.nio.ByteBuffer data)
+  public static RollbackRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.RollbackRequest parseFrom(
+  public static RollbackRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.RollbackRequest parseFrom(com.google.protobuf.ByteString data)
+  public static RollbackRequest parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.RollbackRequest parseFrom(
+  public static RollbackRequest 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.spanner.v1.RollbackRequest parseFrom(byte[] data)
+  public static RollbackRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.RollbackRequest parseFrom(
+  public static RollbackRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.RollbackRequest parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static RollbackRequest parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.RollbackRequest parseFrom(
+  public static RollbackRequest 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.spanner.v1.RollbackRequest parseDelimitedFrom(java.io.InputStream input)
+  public static RollbackRequest parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.RollbackRequest parseDelimitedFrom(
+  public static RollbackRequest 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.spanner.v1.RollbackRequest parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static RollbackRequest parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.RollbackRequest parseFrom(
+  public static RollbackRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -331,7 +324,7 @@ public static com.google.spanner.v1.RollbackRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -340,17 +333,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.RollbackRequest prototype) {
+  public static Builder newBuilder(RollbackRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -366,20 +359,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.RollbackRequest)
-      com.google.spanner.v1.RollbackRequestOrBuilder {
+      RollbackRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_RollbackRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_RollbackRequest_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_RollbackRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.RollbackRequest.class,
-              com.google.spanner.v1.RollbackRequest.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return SpannerProto.internal_static_google_spanner_v1_RollbackRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(RollbackRequest.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.RollbackRequest.newBuilder()
@@ -387,7 +375,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -396,7 +384,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -406,81 +394,78 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_RollbackRequest_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_RollbackRequest_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.RollbackRequest getDefaultInstanceForType() {
-      return com.google.spanner.v1.RollbackRequest.getDefaultInstance();
+    @Override
+    public RollbackRequest getDefaultInstanceForType() {
+      return RollbackRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.RollbackRequest build() {
-      com.google.spanner.v1.RollbackRequest result = buildPartial();
+    @Override
+    public RollbackRequest build() {
+      RollbackRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.RollbackRequest buildPartial() {
-      com.google.spanner.v1.RollbackRequest result =
-          new com.google.spanner.v1.RollbackRequest(this);
+    @Override
+    public RollbackRequest buildPartial() {
+      RollbackRequest result = new RollbackRequest(this);
       result.session_ = session_;
       result.transactionId_ = transactionId_;
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.RollbackRequest) {
-        return mergeFrom((com.google.spanner.v1.RollbackRequest) other);
+      if (other instanceof RollbackRequest) {
+        return mergeFrom((RollbackRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.RollbackRequest other) {
-      if (other == com.google.spanner.v1.RollbackRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(RollbackRequest other) {
+      if (other == RollbackRequest.getDefaultInstance()) return this;
       if (!other.getSession().isEmpty()) {
         session_ = other.session_;
         onChanged();
@@ -493,21 +478,21 @@ public Builder mergeFrom(com.google.spanner.v1.RollbackRequest other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.RollbackRequest parsedMessage = null;
+      RollbackRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.RollbackRequest) e.getUnfinishedMessage();
+        parsedMessage = (RollbackRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -517,7 +502,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private java.lang.Object session_ = "";
+    private Object session_ = "";
     /**
      *
      *
@@ -531,15 +516,15 @@ public Builder mergeFrom(
      *
      * @return The session.
      */
-    public java.lang.String getSession() {
-      java.lang.Object ref = session_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getSession() {
+      Object ref = session_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         session_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -556,10 +541,10 @@ public java.lang.String getSession() {
      * @return The bytes for session.
      */
     public com.google.protobuf.ByteString getSessionBytes() {
-      java.lang.Object ref = session_;
+      Object ref = session_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         session_ = b;
         return b;
       } else {
@@ -580,7 +565,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
      * @param value The session to set.
      * @return This builder for chaining.
      */
-    public Builder setSession(java.lang.String value) {
+    public Builder setSession(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -645,7 +630,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
      *
      * @return The transactionId.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ByteString getTransactionId() {
       return transactionId_;
     }
@@ -688,12 +673,12 @@ public Builder clearTransactionId() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -703,19 +688,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.RollbackRequest)
-  private static final com.google.spanner.v1.RollbackRequest DEFAULT_INSTANCE;
+  private static final RollbackRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.RollbackRequest();
+    DEFAULT_INSTANCE = new RollbackRequest();
   }
 
-  public static com.google.spanner.v1.RollbackRequest getDefaultInstance() {
+  public static RollbackRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public RollbackRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -728,13 +713,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.RollbackRequest getDefaultInstanceForType() {
+  @Override
+  public RollbackRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequestOrBuilder.java
index 06a29aeb00..6a3fb040c3 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface RollbackRequestOrBuilder
    *
    * @return The session.
    */
-  java.lang.String getSession();
+  String getSession();
   /**
    *
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java
index 1b058eb621..ad04cbf05e 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java
@@ -41,13 +41,13 @@ private Session() {
     name_ = "";
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new Session();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private Session(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -73,7 +73,7 @@ private Session(
             break;
           case 10:
             {
-              java.lang.String s = input.readStringRequireUtf8();
+              String s = input.readStringRequireUtf8();
 
               name_ = s;
               break;
@@ -85,7 +85,7 @@ private Session(
                     com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
                 mutable_bitField0_ |= 0x00000001;
               }
-              com.google.protobuf.MapEntry labels__ =
+              com.google.protobuf.MapEntry labels__ =
                   input.readMessage(
                       LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
               labels_.getMutableMap().put(labels__.getKey(), labels__.getValue());
@@ -141,11 +141,11 @@ private Session(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_Session_descriptor;
+    return SpannerProto.internal_static_google_spanner_v1_Session_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
+  @Override
   protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 2:
@@ -155,17 +155,14 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.SpannerProto
-        .internal_static_google_spanner_v1_Session_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.Session.class, com.google.spanner.v1.Session.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return SpannerProto.internal_static_google_spanner_v1_Session_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(Session.class, Builder.class);
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+  private volatile Object name_;
   /**
    *
    *
@@ -177,14 +174,14 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    *
    * @return The name.
    */
-  @java.lang.Override
-  public java.lang.String getName() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getName() {
+    Object ref = name_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       name_ = s;
       return s;
     }
@@ -200,12 +197,11 @@ public java.lang.String getName() {
    *
    * @return The bytes for name.
    */
-  @java.lang.Override
+  @Override
   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);
+    Object ref = name_;
+    if (ref instanceof String) {
+      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
       name_ = b;
       return b;
     } else {
@@ -216,19 +212,18 @@ public com.google.protobuf.ByteString getNameBytes() {
   public static final int LABELS_FIELD_NUMBER = 2;
 
   private static final class LabelsDefaultEntryHolder {
-    static final com.google.protobuf.MapEntry defaultEntry =
-        com.google.protobuf.MapEntry.newDefaultInstance(
-            com.google.spanner.v1.SpannerProto
-                .internal_static_google_spanner_v1_Session_LabelsEntry_descriptor,
+    static final com.google.protobuf.MapEntry defaultEntry =
+        com.google.protobuf.MapEntry.newDefaultInstance(
+            SpannerProto.internal_static_google_spanner_v1_Session_LabelsEntry_descriptor,
             com.google.protobuf.WireFormat.FieldType.STRING,
             "",
             com.google.protobuf.WireFormat.FieldType.STRING,
             "");
   }
 
-  private com.google.protobuf.MapField labels_;
+  private com.google.protobuf.MapField labels_;
 
-  private com.google.protobuf.MapField internalGetLabels() {
+  private com.google.protobuf.MapField internalGetLabels() {
     if (labels_ == null) {
       return com.google.protobuf.MapField.emptyMapField(LabelsDefaultEntryHolder.defaultEntry);
     }
@@ -253,17 +248,17 @@ public int getLabelsCount() {
    *
    * map<string, string> labels = 2;
    */
-  @java.lang.Override
-  public boolean containsLabels(java.lang.String key) {
+  @Override
+  public boolean containsLabels(String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     return internalGetLabels().getMap().containsKey(key);
   }
   /** Use {@link #getLabelsMap()} instead. */
-  @java.lang.Override
-  @java.lang.Deprecated
-  public java.util.Map getLabels() {
+  @Override
+  @Deprecated
+  public java.util.Map getLabels() {
     return getLabelsMap();
   }
   /**
@@ -281,8 +276,8 @@ public java.util.Map getLabels() {
    *
    * map<string, string> labels = 2;
    */
-  @java.lang.Override
-  public java.util.Map getLabelsMap() {
+  @Override
+  public java.util.Map getLabelsMap() {
     return internalGetLabels().getMap();
   }
   /**
@@ -300,12 +295,12 @@ public java.util.Map getLabelsMap() {
    *
    * map<string, string> labels = 2;
    */
-  @java.lang.Override
-  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
+  @Override
+  public String getLabelsOrDefault(String key, String defaultValue) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
-    java.util.Map map = internalGetLabels().getMap();
+    java.util.Map map = internalGetLabels().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
   /**
@@ -323,14 +318,14 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin
    *
    * map<string, string> labels = 2;
    */
-  @java.lang.Override
-  public java.lang.String getLabelsOrThrow(java.lang.String key) {
+  @Override
+  public String getLabelsOrThrow(String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
-    java.util.Map map = internalGetLabels().getMap();
+    java.util.Map map = internalGetLabels().getMap();
     if (!map.containsKey(key)) {
-      throw new java.lang.IllegalArgumentException();
+      throw new IllegalArgumentException();
     }
     return map.get(key);
   }
@@ -349,7 +344,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
    *
    * @return Whether the createTime field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasCreateTime() {
     return createTime_ != null;
   }
@@ -365,7 +360,7 @@ public boolean hasCreateTime() {
    *
    * @return The createTime.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Timestamp getCreateTime() {
     return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
@@ -379,7 +374,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    * .google.protobuf.Timestamp create_time = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * 
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
     return getCreateTime();
   }
@@ -400,7 +395,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    *
    * @return Whether the approximateLastUseTime field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasApproximateLastUseTime() {
     return approximateLastUseTime_ != null;
   }
@@ -418,7 +413,7 @@ public boolean hasApproximateLastUseTime() {
    *
    * @return The approximateLastUseTime.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Timestamp getApproximateLastUseTime() {
     return approximateLastUseTime_ == null
         ? com.google.protobuf.Timestamp.getDefaultInstance()
@@ -436,14 +431,14 @@ public com.google.protobuf.Timestamp getApproximateLastUseTime() {
    * .google.protobuf.Timestamp approximate_last_use_time = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * 
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.TimestampOrBuilder getApproximateLastUseTimeOrBuilder() {
     return getApproximateLastUseTime();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -453,7 +448,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
@@ -469,7 +464,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -478,9 +473,8 @@ public int getSerializedSize() {
     if (!getNameBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    for (java.util.Map.Entry entry :
-        internalGetLabels().getMap().entrySet()) {
-      com.google.protobuf.MapEntry labels__ =
+    for (java.util.Map.Entry entry : internalGetLabels().getMap().entrySet()) {
+      com.google.protobuf.MapEntry labels__ =
           LabelsDefaultEntryHolder.defaultEntry
               .newBuilderForType()
               .setKey(entry.getKey())
@@ -500,15 +494,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.Session)) {
+    if (!(obj instanceof Session)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.Session other = (com.google.spanner.v1.Session) obj;
+    Session other = (Session) obj;
 
     if (!getName().equals(other.getName())) return false;
     if (!internalGetLabels().equals(other.internalGetLabels())) return false;
@@ -524,7 +518,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -550,70 +544,68 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.Session parseFrom(java.nio.ByteBuffer data)
+  public static Session parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Session parseFrom(
+  public static Session parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.Session parseFrom(com.google.protobuf.ByteString data)
+  public static Session parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Session parseFrom(
+  public static Session 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.spanner.v1.Session parseFrom(byte[] data)
+  public static Session parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Session parseFrom(
+  public static Session parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.Session parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static Session parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Session parseFrom(
+  public static Session 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.spanner.v1.Session parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static Session parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Session parseDelimitedFrom(
+  public static Session 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.spanner.v1.Session parseFrom(com.google.protobuf.CodedInputStream input)
+  public static Session parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Session parseFrom(
+  public static Session parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -621,7 +613,7 @@ public static com.google.spanner.v1.Session parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -630,17 +622,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.Session prototype) {
+  public static Builder newBuilder(Session prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -656,10 +648,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.Session)
-      com.google.spanner.v1.SessionOrBuilder {
+      SessionOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_Session_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_Session_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -682,13 +673,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       }
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_Session_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.Session.class, com.google.spanner.v1.Session.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return SpannerProto.internal_static_google_spanner_v1_Session_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(Session.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.Session.newBuilder()
@@ -696,7 +684,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -705,7 +693,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -726,29 +714,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.SpannerProto
-          .internal_static_google_spanner_v1_Session_descriptor;
+      return SpannerProto.internal_static_google_spanner_v1_Session_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Session getDefaultInstanceForType() {
-      return com.google.spanner.v1.Session.getDefaultInstance();
+    @Override
+    public Session getDefaultInstanceForType() {
+      return Session.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Session build() {
-      com.google.spanner.v1.Session result = buildPartial();
+    @Override
+    public Session build() {
+      Session result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Session buildPartial() {
-      com.google.spanner.v1.Session result = new com.google.spanner.v1.Session(this);
+    @Override
+    public Session buildPartial() {
+      Session result = new Session(this);
       int from_bitField0_ = bitField0_;
       result.name_ = name_;
       result.labels_ = internalGetLabels();
@@ -767,51 +754,50 @@ public com.google.spanner.v1.Session buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.Session) {
-        return mergeFrom((com.google.spanner.v1.Session) other);
+      if (other instanceof Session) {
+        return mergeFrom((Session) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.Session other) {
-      if (other == com.google.spanner.v1.Session.getDefaultInstance()) return this;
+    public Builder mergeFrom(Session other) {
+      if (other == Session.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
         onChanged();
@@ -828,21 +814,21 @@ public Builder mergeFrom(com.google.spanner.v1.Session other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.Session parsedMessage = null;
+      Session parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.Session) e.getUnfinishedMessage();
+        parsedMessage = (Session) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -854,7 +840,7 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.lang.Object name_ = "";
+    private Object name_ = "";
     /**
      *
      *
@@ -866,15 +852,15 @@ public Builder mergeFrom(
      *
      * @return The name.
      */
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getName() {
+      Object ref = name_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         name_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
@@ -889,10 +875,10 @@ public java.lang.String getName() {
      * @return The bytes for name.
      */
     public com.google.protobuf.ByteString getNameBytes() {
-      java.lang.Object ref = name_;
+      Object ref = name_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         name_ = b;
         return b;
       } else {
@@ -911,7 +897,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      * @param value The name to set.
      * @return This builder for chaining.
      */
-    public Builder setName(java.lang.String value) {
+    public Builder setName(String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -960,17 +946,16 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.protobuf.MapField labels_;
+    private com.google.protobuf.MapField labels_;
 
-    private com.google.protobuf.MapField internalGetLabels() {
+    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() {
+    private com.google.protobuf.MapField internalGetMutableLabels() {
       onChanged();
       ;
       if (labels_ == null) {
@@ -1000,17 +985,17 @@ public int getLabelsCount() {
      *
      * map<string, string> labels = 2;
      */
-    @java.lang.Override
-    public boolean containsLabels(java.lang.String key) {
+    @Override
+    public boolean containsLabels(String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       return internalGetLabels().getMap().containsKey(key);
     }
     /** Use {@link #getLabelsMap()} instead. */
-    @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map getLabels() {
+    @Override
+    @Deprecated
+    public java.util.Map getLabels() {
       return getLabelsMap();
     }
     /**
@@ -1028,8 +1013,8 @@ public java.util.Map getLabels() {
      *
      * map<string, string> labels = 2;
      */
-    @java.lang.Override
-    public java.util.Map getLabelsMap() {
+    @Override
+    public java.util.Map getLabelsMap() {
       return internalGetLabels().getMap();
     }
     /**
@@ -1047,13 +1032,12 @@ public java.util.Map getLabelsMap() {
      *
      * map<string, string> labels = 2;
      */
-    @java.lang.Override
-    public java.lang.String getLabelsOrDefault(
-        java.lang.String key, java.lang.String defaultValue) {
+    @Override
+    public String getLabelsOrDefault(String key, String defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
-      java.util.Map map = internalGetLabels().getMap();
+      java.util.Map map = internalGetLabels().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
@@ -1071,14 +1055,14 @@ public java.lang.String getLabelsOrDefault(
      *
      * map<string, string> labels = 2;
      */
-    @java.lang.Override
-    public java.lang.String getLabelsOrThrow(java.lang.String key) {
+    @Override
+    public String getLabelsOrThrow(String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
-      java.util.Map map = internalGetLabels().getMap();
+      java.util.Map map = internalGetLabels().getMap();
       if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
+        throw new IllegalArgumentException();
       }
       return map.get(key);
     }
@@ -1102,16 +1086,16 @@ public Builder clearLabels() {
      *
      * map<string, string> labels = 2;
      */
-    public Builder removeLabels(java.lang.String key) {
+    public Builder removeLabels(String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       internalGetMutableLabels().getMutableMap().remove(key);
       return this;
     }
     /** Use alternate mutation accessors instead. */
-    @java.lang.Deprecated
-    public java.util.Map getMutableLabels() {
+    @Deprecated
+    public java.util.Map getMutableLabels() {
       return internalGetMutableLabels().getMutableMap();
     }
     /**
@@ -1129,12 +1113,12 @@ public java.util.Map getMutableLabels() {
      *
      * map<string, string> labels = 2;
      */
-    public Builder putLabels(java.lang.String key, java.lang.String value) {
+    public Builder putLabels(String key, String value) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       if (value == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       internalGetMutableLabels().getMutableMap().put(key, value);
       return this;
@@ -1154,7 +1138,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
      *
      * map<string, string> labels = 2;
      */
-    public Builder putAllLabels(java.util.Map values) {
+    public Builder putAllLabels(java.util.Map values) {
       internalGetMutableLabels().getMutableMap().putAll(values);
       return this;
     }
@@ -1573,12 +1557,12 @@ public com.google.protobuf.TimestampOrBuilder getApproximateLastUseTimeOrBuilder
       return approximateLastUseTimeBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1588,19 +1572,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.Session)
-  private static final com.google.spanner.v1.Session DEFAULT_INSTANCE;
+  private static final Session DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.Session();
+    DEFAULT_INSTANCE = new Session();
   }
 
-  public static com.google.spanner.v1.Session getDefaultInstance() {
+  public static Session getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public Session parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1613,13 +1597,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.Session getDefaultInstanceForType() {
+  @Override
+  public Session getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SessionOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SessionOrBuilder.java
index 556832d009..4344161ff8 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SessionOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SessionOrBuilder.java
@@ -34,7 +34,7 @@ public interface SessionOrBuilder
    *
    * @return The name.
    */
-  java.lang.String getName();
+  String getName();
   /**
    *
    *
@@ -79,10 +79,10 @@ public interface SessionOrBuilder
    *
    * map<string, string> labels = 2;
    */
-  boolean containsLabels(java.lang.String key);
+  boolean containsLabels(String key);
   /** Use {@link #getLabelsMap()} instead. */
-  @java.lang.Deprecated
-  java.util.Map getLabels();
+  @Deprecated
+  java.util.Map getLabels();
   /**
    *
    *
@@ -98,7 +98,7 @@ public interface SessionOrBuilder
    *
    * map<string, string> labels = 2;
    */
-  java.util.Map getLabelsMap();
+  java.util.Map getLabelsMap();
   /**
    *
    *
@@ -114,7 +114,7 @@ public interface SessionOrBuilder
    *
    * map<string, string> labels = 2;
    */
-  java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue);
+  String getLabelsOrDefault(String key, String defaultValue);
   /**
    *
    *
@@ -130,7 +130,7 @@ public interface SessionOrBuilder
    *
    * map<string, string> labels = 2;
    */
-  java.lang.String getLabelsOrThrow(java.lang.String key);
+  String getLabelsOrThrow(String key);
 
   /**
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java
index 0d1175fb19..f968b0da51 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java
@@ -152,220 +152,220 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
 
   static {
     java.lang.String[] descriptorData = {
-      "\n\037google/spanner/v1/spanner.proto\022\021googl"
-          + "e.spanner.v1\032\034google/api/annotations.pro"
-          + "to\032\027google/api/client.proto\032\037google/api/"
-          + "field_behavior.proto\032\031google/api/resourc"
-          + "e.proto\032\036google/protobuf/duration.proto\032"
-          + "\033google/protobuf/empty.proto\032\034google/pro"
-          + "tobuf/struct.proto\032\037google/protobuf/time"
-          + "stamp.proto\032\027google/rpc/status.proto\032\034go"
-          + "ogle/spanner/v1/keys.proto\032 google/spann"
-          + "er/v1/mutation.proto\032\"google/spanner/v1/"
-          + "result_set.proto\032#google/spanner/v1/tran"
-          + "saction.proto\032\034google/spanner/v1/type.pr"
-          + "oto\"~\n\024CreateSessionRequest\0229\n\010database\030"
-          + "\001 \001(\tB\'\340A\002\372A!\n\037spanner.googleapis.com/Da"
-          + "tabase\022+\n\007session\030\002 \001(\0132\032.google.spanner"
-          + ".v1.Session\"\251\001\n\032BatchCreateSessionsReque"
-          + "st\0229\n\010database\030\001 \001(\tB\'\340A\002\372A!\n\037spanner.go"
-          + "ogleapis.com/Database\0224\n\020session_templat"
-          + "e\030\002 \001(\0132\032.google.spanner.v1.Session\022\032\n\rs"
-          + "ession_count\030\003 \001(\005B\003\340A\002\"J\n\033BatchCreateSe"
-          + "ssionsResponse\022+\n\007session\030\001 \003(\0132\032.google"
-          + ".spanner.v1.Session\"\363\002\n\007Session\022\021\n\004name\030"
-          + "\001 \001(\tB\003\340A\003\0226\n\006labels\030\002 \003(\0132&.google.span"
-          + "ner.v1.Session.LabelsEntry\0224\n\013create_tim"
-          + "e\030\003 \001(\0132\032.google.protobuf.TimestampB\003\340A\003"
-          + "\022B\n\031approximate_last_use_time\030\004 \001(\0132\032.go"
-          + "ogle.protobuf.TimestampB\003\340A\003\032-\n\013LabelsEn"
-          + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001:t\352Aq"
-          + "\n\036spanner.googleapis.com/Session\022Oprojec"
-          + "ts/{project}/instances/{instance}/databa"
-          + "ses/{database}/sessions/{session}\"I\n\021Get"
-          + "SessionRequest\0224\n\004name\030\001 \001(\tB&\340A\002\372A \n\036sp"
-          + "anner.googleapis.com/Session\"\207\001\n\023ListSes"
-          + "sionsRequest\0229\n\010database\030\001 \001(\tB\'\340A\002\372A!\n\037"
-          + "spanner.googleapis.com/Database\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\"]\n\024ListSessionsResponse\022,\n\010sessio"
-          + "ns\030\001 \003(\0132\032.google.spanner.v1.Session\022\027\n\017"
-          + "next_page_token\030\002 \001(\t\"L\n\024DeleteSessionRe"
-          + "quest\0224\n\004name\030\001 \001(\tB&\340A\002\372A \n\036spanner.goo"
-          + "gleapis.com/Session\"\334\001\n\016RequestOptions\022<"
-          + "\n\010priority\030\001 \001(\0162*.google.spanner.v1.Req"
-          + "uestOptions.Priority\022\023\n\013request_tag\030\002 \001("
-          + "\t\022\027\n\017transaction_tag\030\003 \001(\t\"^\n\010Priority\022\030"
-          + "\n\024PRIORITY_UNSPECIFIED\020\000\022\020\n\014PRIORITY_LOW"
-          + "\020\001\022\023\n\017PRIORITY_MEDIUM\020\002\022\021\n\rPRIORITY_HIGH"
-          + "\020\003\"\344\005\n\021ExecuteSqlRequest\0227\n\007session\030\001 \001("
-          + "\tB&\340A\002\372A \n\036spanner.googleapis.com/Sessio"
-          + "n\022;\n\013transaction\030\002 \001(\0132&.google.spanner."
-          + "v1.TransactionSelector\022\020\n\003sql\030\003 \001(\tB\003\340A\002"
-          + "\022\'\n\006params\030\004 \001(\0132\027.google.protobuf.Struc"
-          + "t\022I\n\013param_types\030\005 \003(\01324.google.spanner."
-          + "v1.ExecuteSqlRequest.ParamTypesEntry\022\024\n\014"
-          + "resume_token\030\006 \001(\014\022B\n\nquery_mode\030\007 \001(\0162."
-          + ".google.spanner.v1.ExecuteSqlRequest.Que"
-          + "ryMode\022\027\n\017partition_token\030\010 \001(\014\022\r\n\005seqno"
-          + "\030\t \001(\003\022H\n\rquery_options\030\n \001(\01321.google.s"
-          + "panner.v1.ExecuteSqlRequest.QueryOptions"
-          + "\022:\n\017request_options\030\013 \001(\0132!.google.spann"
-          + "er.v1.RequestOptions\032O\n\014QueryOptions\022\031\n\021"
-          + "optimizer_version\030\001 \001(\t\022$\n\034optimizer_sta"
-          + "tistics_package\030\002 \001(\t\032J\n\017ParamTypesEntry"
-          + "\022\013\n\003key\030\001 \001(\t\022&\n\005value\030\002 \001(\0132\027.google.sp"
-          + "anner.v1.Type:\0028\001\".\n\tQueryMode\022\n\n\006NORMAL"
-          + "\020\000\022\010\n\004PLAN\020\001\022\013\n\007PROFILE\020\002\"\233\004\n\026ExecuteBat"
-          + "chDmlRequest\0227\n\007session\030\001 \001(\tB&\340A\002\372A \n\036s"
-          + "panner.googleapis.com/Session\022@\n\013transac"
-          + "tion\030\002 \001(\0132&.google.spanner.v1.Transacti"
-          + "onSelectorB\003\340A\002\022L\n\nstatements\030\003 \003(\01323.go"
-          + "ogle.spanner.v1.ExecuteBatchDmlRequest.S"
-          + "tatementB\003\340A\002\022\022\n\005seqno\030\004 \001(\003B\003\340A\002\022:\n\017req"
-          + "uest_options\030\005 \001(\0132!.google.spanner.v1.R"
-          + "equestOptions\032\347\001\n\tStatement\022\013\n\003sql\030\001 \001(\t"
-          + "\022\'\n\006params\030\002 \001(\0132\027.google.protobuf.Struc"
-          + "t\022X\n\013param_types\030\003 \003(\0132C.google.spanner."
-          + "v1.ExecuteBatchDmlRequest.Statement.Para"
-          + "mTypesEntry\032J\n\017ParamTypesEntry\022\013\n\003key\030\001 "
-          + "\001(\t\022&\n\005value\030\002 \001(\0132\027.google.spanner.v1.T"
-          + "ype:\0028\001\"p\n\027ExecuteBatchDmlResponse\0221\n\013re"
-          + "sult_sets\030\001 \003(\0132\034.google.spanner.v1.Resu"
-          + "ltSet\022\"\n\006status\030\002 \001(\0132\022.google.rpc.Statu"
-          + "s\"H\n\020PartitionOptions\022\034\n\024partition_size_"
-          + "bytes\030\001 \001(\003\022\026\n\016max_partitions\030\002 \001(\003\"\243\003\n\025"
-          + "PartitionQueryRequest\0227\n\007session\030\001 \001(\tB&"
-          + "\340A\002\372A \n\036spanner.googleapis.com/Session\022;"
-          + "\n\013transaction\030\002 \001(\0132&.google.spanner.v1."
-          + "TransactionSelector\022\020\n\003sql\030\003 \001(\tB\003\340A\002\022\'\n"
-          + "\006params\030\004 \001(\0132\027.google.protobuf.Struct\022M"
-          + "\n\013param_types\030\005 \003(\01328.google.spanner.v1."
-          + "PartitionQueryRequest.ParamTypesEntry\022>\n"
-          + "\021partition_options\030\006 \001(\0132#.google.spanne"
-          + "r.v1.PartitionOptions\032J\n\017ParamTypesEntry"
-          + "\022\013\n\003key\030\001 \001(\t\022&\n\005value\030\002 \001(\0132\027.google.sp"
-          + "anner.v1.Type:\0028\001\"\261\002\n\024PartitionReadReque"
-          + "st\0227\n\007session\030\001 \001(\tB&\340A\002\372A \n\036spanner.goo"
-          + "gleapis.com/Session\022;\n\013transaction\030\002 \001(\013"
-          + "2&.google.spanner.v1.TransactionSelector"
-          + "\022\022\n\005table\030\003 \001(\tB\003\340A\002\022\r\n\005index\030\004 \001(\t\022\017\n\007c"
-          + "olumns\030\005 \003(\t\022/\n\007key_set\030\006 \001(\0132\031.google.s"
-          + "panner.v1.KeySetB\003\340A\002\022>\n\021partition_optio"
-          + "ns\030\t \001(\0132#.google.spanner.v1.PartitionOp"
-          + "tions\"$\n\tPartition\022\027\n\017partition_token\030\001 "
-          + "\001(\014\"z\n\021PartitionResponse\0220\n\npartitions\030\001"
-          + " \003(\0132\034.google.spanner.v1.Partition\0223\n\013tr"
-          + "ansaction\030\002 \001(\0132\036.google.spanner.v1.Tran"
-          + "saction\"\347\002\n\013ReadRequest\0227\n\007session\030\001 \001(\t"
-          + "B&\340A\002\372A \n\036spanner.googleapis.com/Session"
-          + "\022;\n\013transaction\030\002 \001(\0132&.google.spanner.v"
-          + "1.TransactionSelector\022\022\n\005table\030\003 \001(\tB\003\340A"
-          + "\002\022\r\n\005index\030\004 \001(\t\022\024\n\007columns\030\005 \003(\tB\003\340A\002\022/"
-          + "\n\007key_set\030\006 \001(\0132\031.google.spanner.v1.KeyS"
-          + "etB\003\340A\002\022\r\n\005limit\030\010 \001(\003\022\024\n\014resume_token\030\t"
-          + " \001(\014\022\027\n\017partition_token\030\n \001(\014\022:\n\017request"
-          + "_options\030\013 \001(\0132!.google.spanner.v1.Reque"
-          + "stOptions\"\313\001\n\027BeginTransactionRequest\0227\n"
-          + "\007session\030\001 \001(\tB&\340A\002\372A \n\036spanner.googleap"
-          + "is.com/Session\022;\n\007options\030\002 \001(\0132%.google"
-          + ".spanner.v1.TransactionOptionsB\003\340A\002\022:\n\017r"
-          + "equest_options\030\003 \001(\0132!.google.spanner.v1"
-          + ".RequestOptions\"\303\002\n\rCommitRequest\0227\n\007ses"
-          + "sion\030\001 \001(\tB&\340A\002\372A \n\036spanner.googleapis.c"
-          + "om/Session\022\030\n\016transaction_id\030\002 \001(\014H\000\022G\n\026"
-          + "single_use_transaction\030\003 \001(\0132%.google.sp"
-          + "anner.v1.TransactionOptionsH\000\022.\n\tmutatio"
-          + "ns\030\004 \003(\0132\033.google.spanner.v1.Mutation\022\033\n"
-          + "\023return_commit_stats\030\005 \001(\010\022:\n\017request_op"
-          + "tions\030\006 \001(\0132!.google.spanner.v1.RequestO"
-          + "ptionsB\r\n\013transaction\"\262\001\n\016CommitResponse"
-          + "\0224\n\020commit_timestamp\030\001 \001(\0132\032.google.prot"
-          + "obuf.Timestamp\022C\n\014commit_stats\030\002 \001(\0132-.g"
-          + "oogle.spanner.v1.CommitResponse.CommitSt"
-          + "ats\032%\n\013CommitStats\022\026\n\016mutation_count\030\001 \001"
-          + "(\003\"g\n\017RollbackRequest\0227\n\007session\030\001 \001(\tB&"
-          + "\340A\002\372A \n\036spanner.googleapis.com/Session\022\033"
-          + "\n\016transaction_id\030\002 \001(\014B\003\340A\0022\300\026\n\007Spanner\022"
-          + "\246\001\n\rCreateSession\022\'.google.spanner.v1.Cr"
-          + "eateSessionRequest\032\032.google.spanner.v1.S"
-          + "ession\"P\202\323\344\223\002?\":/v1/{database=projects/*"
-          + "/instances/*/databases/*}/sessions:\001*\332A\010"
-          + "database\022\340\001\n\023BatchCreateSessions\022-.googl"
-          + "e.spanner.v1.BatchCreateSessionsRequest\032"
-          + "..google.spanner.v1.BatchCreateSessionsR"
-          + "esponse\"j\202\323\344\223\002K\"F/v1/{database=projects/"
-          + "*/instances/*/databases/*}/sessions:batc"
-          + "hCreate:\001*\332A\026database,session_count\022\227\001\n\n"
-          + "GetSession\022$.google.spanner.v1.GetSessio"
-          + "nRequest\032\032.google.spanner.v1.Session\"G\202\323"
-          + "\344\223\002:\0228/v1/{name=projects/*/instances/*/d"
-          + "atabases/*/sessions/*}\332A\004name\022\256\001\n\014ListSe"
-          + "ssions\022&.google.spanner.v1.ListSessionsR"
-          + "equest\032\'.google.spanner.v1.ListSessionsR"
-          + "esponse\"M\202\323\344\223\002<\022:/v1/{database=projects/"
-          + "*/instances/*/databases/*}/sessions\332A\010da"
-          + "tabase\022\231\001\n\rDeleteSession\022\'.google.spanne"
-          + "r.v1.DeleteSessionRequest\032\026.google.proto"
-          + "buf.Empty\"G\202\323\344\223\002:*8/v1/{name=projects/*/"
-          + "instances/*/databases/*/sessions/*}\332A\004na"
-          + "me\022\243\001\n\nExecuteSql\022$.google.spanner.v1.Ex"
-          + "ecuteSqlRequest\032\034.google.spanner.v1.Resu"
-          + "ltSet\"Q\202\323\344\223\002K\"F/v1/{session=projects/*/i"
-          + "nstances/*/databases/*/sessions/*}:execu"
-          + "teSql:\001*\022\276\001\n\023ExecuteStreamingSql\022$.googl"
-          + "e.spanner.v1.ExecuteSqlRequest\032#.google."
-          + "spanner.v1.PartialResultSet\"Z\202\323\344\223\002T\"O/v1"
-          + "/{session=projects/*/instances/*/databas"
-          + "es/*/sessions/*}:executeStreamingSql:\001*0"
-          + "\001\022\300\001\n\017ExecuteBatchDml\022).google.spanner.v"
-          + "1.ExecuteBatchDmlRequest\032*.google.spanne"
-          + "r.v1.ExecuteBatchDmlResponse\"V\202\323\344\223\002P\"K/v"
-          + "1/{session=projects/*/instances/*/databa"
-          + "ses/*/sessions/*}:executeBatchDml:\001*\022\221\001\n"
-          + "\004Read\022\036.google.spanner.v1.ReadRequest\032\034."
-          + "google.spanner.v1.ResultSet\"K\202\323\344\223\002E\"@/v1"
-          + "/{session=projects/*/instances/*/databas"
-          + "es/*/sessions/*}:read:\001*\022\254\001\n\rStreamingRe"
-          + "ad\022\036.google.spanner.v1.ReadRequest\032#.goo"
-          + "gle.spanner.v1.PartialResultSet\"T\202\323\344\223\002N\""
-          + "I/v1/{session=projects/*/instances/*/dat"
-          + "abases/*/sessions/*}:streamingRead:\001*0\001\022"
-          + "\311\001\n\020BeginTransaction\022*.google.spanner.v1"
-          + ".BeginTransactionRequest\032\036.google.spanne"
-          + "r.v1.Transaction\"i\202\323\344\223\002Q\"L/v1/{session=p"
-          + "rojects/*/instances/*/databases/*/sessio"
-          + "ns/*}:beginTransaction:\001*\332A\017session,opti"
-          + "ons\022\353\001\n\006Commit\022 .google.spanner.v1.Commi"
-          + "tRequest\032!.google.spanner.v1.CommitRespo"
-          + "nse\"\233\001\202\323\344\223\002G\"B/v1/{session=projects/*/in"
-          + "stances/*/databases/*/sessions/*}:commit"
-          + ":\001*\332A session,transaction_id,mutations\332A"
-          + "(session,single_use_transaction,mutation"
-          + "s\022\260\001\n\010Rollback\022\".google.spanner.v1.Rollb"
-          + "ackRequest\032\026.google.protobuf.Empty\"h\202\323\344\223"
-          + "\002I\"D/v1/{session=projects/*/instances/*/"
-          + "databases/*/sessions/*}:rollback:\001*\332A\026se"
-          + "ssion,transaction_id\022\267\001\n\016PartitionQuery\022"
-          + "(.google.spanner.v1.PartitionQueryReques"
-          + "t\032$.google.spanner.v1.PartitionResponse\""
-          + "U\202\323\344\223\002O\"J/v1/{session=projects/*/instanc"
-          + "es/*/databases/*/sessions/*}:partitionQu"
-          + "ery:\001*\022\264\001\n\rPartitionRead\022\'.google.spanne"
-          + "r.v1.PartitionReadRequest\032$.google.spann"
-          + "er.v1.PartitionResponse\"T\202\323\344\223\002N\"I/v1/{se"
-          + "ssion=projects/*/instances/*/databases/*"
-          + "/sessions/*}:partitionRead:\001*\032w\312A\026spanne"
-          + "r.googleapis.com\322A[https://www.googleapi"
-          + "s.com/auth/cloud-platform,https://www.go"
-          + "ogleapis.com/auth/spanner.dataB\224\002\n\025com.g"
-          + "oogle.spanner.v1B\014SpannerProtoP\001Z8google"
-          + ".golang.org/genproto/googleapis/spanner/"
-          + "v1;spanner\252\002\027Google.Cloud.Spanner.V1\312\002\027G"
-          + "oogle\\Cloud\\Spanner\\V1\352\002\032Google::Cloud::"
-          + "Spanner::V1\352A_\n\037spanner.googleapis.com/D"
-          + "atabase\022\n"
+            + "\021partition_options\030\006 \001(\0132#.google.spanne"
+            + "r.v1.PartitionOptions\032J\n\017ParamTypesEntry"
+            + "\022\013\n\003key\030\001 \001(\t\022&\n\005value\030\002 \001(\0132\027.google.sp"
+            + "anner.v1.Type:\0028\001\"\261\002\n\024PartitionReadReque"
+            + "st\0227\n\007session\030\001 \001(\tB&\340A\002\372A \n\036spanner.goo"
+            + "gleapis.com/Session\022;\n\013transaction\030\002 \001(\013"
+            + "2&.google.spanner.v1.TransactionSelector"
+            + "\022\022\n\005table\030\003 \001(\tB\003\340A\002\022\r\n\005index\030\004 \001(\t\022\017\n\007c"
+            + "olumns\030\005 \003(\t\022/\n\007key_set\030\006 \001(\0132\031.google.s"
+            + "panner.v1.KeySetB\003\340A\002\022>\n\021partition_optio"
+            + "ns\030\t \001(\0132#.google.spanner.v1.PartitionOp"
+            + "tions\"$\n\tPartition\022\027\n\017partition_token\030\001 "
+            + "\001(\014\"z\n\021PartitionResponse\0220\n\npartitions\030\001"
+            + " \003(\0132\034.google.spanner.v1.Partition\0223\n\013tr"
+            + "ansaction\030\002 \001(\0132\036.google.spanner.v1.Tran"
+            + "saction\"\347\002\n\013ReadRequest\0227\n\007session\030\001 \001(\t"
+            + "B&\340A\002\372A \n\036spanner.googleapis.com/Session"
+            + "\022;\n\013transaction\030\002 \001(\0132&.google.spanner.v"
+            + "1.TransactionSelector\022\022\n\005table\030\003 \001(\tB\003\340A"
+            + "\002\022\r\n\005index\030\004 \001(\t\022\024\n\007columns\030\005 \003(\tB\003\340A\002\022/"
+            + "\n\007key_set\030\006 \001(\0132\031.google.spanner.v1.KeyS"
+            + "etB\003\340A\002\022\r\n\005limit\030\010 \001(\003\022\024\n\014resume_token\030\t"
+            + " \001(\014\022\027\n\017partition_token\030\n \001(\014\022:\n\017request"
+            + "_options\030\013 \001(\0132!.google.spanner.v1.Reque"
+            + "stOptions\"\313\001\n\027BeginTransactionRequest\0227\n"
+            + "\007session\030\001 \001(\tB&\340A\002\372A \n\036spanner.googleap"
+            + "is.com/Session\022;\n\007options\030\002 \001(\0132%.google"
+            + ".spanner.v1.TransactionOptionsB\003\340A\002\022:\n\017r"
+            + "equest_options\030\003 \001(\0132!.google.spanner.v1"
+            + ".RequestOptions\"\303\002\n\rCommitRequest\0227\n\007ses"
+            + "sion\030\001 \001(\tB&\340A\002\372A \n\036spanner.googleapis.c"
+            + "om/Session\022\030\n\016transaction_id\030\002 \001(\014H\000\022G\n\026"
+            + "single_use_transaction\030\003 \001(\0132%.google.sp"
+            + "anner.v1.TransactionOptionsH\000\022.\n\tmutatio"
+            + "ns\030\004 \003(\0132\033.google.spanner.v1.Mutation\022\033\n"
+            + "\023return_commit_stats\030\005 \001(\010\022:\n\017request_op"
+            + "tions\030\006 \001(\0132!.google.spanner.v1.RequestO"
+            + "ptionsB\r\n\013transaction\"\262\001\n\016CommitResponse"
+            + "\0224\n\020commit_timestamp\030\001 \001(\0132\032.google.prot"
+            + "obuf.Timestamp\022C\n\014commit_stats\030\002 \001(\0132-.g"
+            + "oogle.spanner.v1.CommitResponse.CommitSt"
+            + "ats\032%\n\013CommitStats\022\026\n\016mutation_count\030\001 \001"
+            + "(\003\"g\n\017RollbackRequest\0227\n\007session\030\001 \001(\tB&"
+            + "\340A\002\372A \n\036spanner.googleapis.com/Session\022\033"
+            + "\n\016transaction_id\030\002 \001(\014B\003\340A\0022\300\026\n\007Spanner\022"
+            + "\246\001\n\rCreateSession\022\'.google.spanner.v1.Cr"
+            + "eateSessionRequest\032\032.google.spanner.v1.S"
+            + "ession\"P\202\323\344\223\002?\":/v1/{database=projects/*"
+            + "/instances/*/databases/*}/sessions:\001*\332A\010"
+            + "database\022\340\001\n\023BatchCreateSessions\022-.googl"
+            + "e.spanner.v1.BatchCreateSessionsRequest\032"
+            + "..google.spanner.v1.BatchCreateSessionsR"
+            + "esponse\"j\202\323\344\223\002K\"F/v1/{database=projects/"
+            + "*/instances/*/databases/*}/sessions:batc"
+            + "hCreate:\001*\332A\026database,session_count\022\227\001\n\n"
+            + "GetSession\022$.google.spanner.v1.GetSessio"
+            + "nRequest\032\032.google.spanner.v1.Session\"G\202\323"
+            + "\344\223\002:\0228/v1/{name=projects/*/instances/*/d"
+            + "atabases/*/sessions/*}\332A\004name\022\256\001\n\014ListSe"
+            + "ssions\022&.google.spanner.v1.ListSessionsR"
+            + "equest\032\'.google.spanner.v1.ListSessionsR"
+            + "esponse\"M\202\323\344\223\002<\022:/v1/{database=projects/"
+            + "*/instances/*/databases/*}/sessions\332A\010da"
+            + "tabase\022\231\001\n\rDeleteSession\022\'.google.spanne"
+            + "r.v1.DeleteSessionRequest\032\026.google.proto"
+            + "buf.Empty\"G\202\323\344\223\002:*8/v1/{name=projects/*/"
+            + "instances/*/databases/*/sessions/*}\332A\004na"
+            + "me\022\243\001\n\nExecuteSql\022$.google.spanner.v1.Ex"
+            + "ecuteSqlRequest\032\034.google.spanner.v1.Resu"
+            + "ltSet\"Q\202\323\344\223\002K\"F/v1/{session=projects/*/i"
+            + "nstances/*/databases/*/sessions/*}:execu"
+            + "teSql:\001*\022\276\001\n\023ExecuteStreamingSql\022$.googl"
+            + "e.spanner.v1.ExecuteSqlRequest\032#.google."
+            + "spanner.v1.PartialResultSet\"Z\202\323\344\223\002T\"O/v1"
+            + "/{session=projects/*/instances/*/databas"
+            + "es/*/sessions/*}:executeStreamingSql:\001*0"
+            + "\001\022\300\001\n\017ExecuteBatchDml\022).google.spanner.v"
+            + "1.ExecuteBatchDmlRequest\032*.google.spanne"
+            + "r.v1.ExecuteBatchDmlResponse\"V\202\323\344\223\002P\"K/v"
+            + "1/{session=projects/*/instances/*/databa"
+            + "ses/*/sessions/*}:executeBatchDml:\001*\022\221\001\n"
+            + "\004Read\022\036.google.spanner.v1.ReadRequest\032\034."
+            + "google.spanner.v1.ResultSet\"K\202\323\344\223\002E\"@/v1"
+            + "/{session=projects/*/instances/*/databas"
+            + "es/*/sessions/*}:read:\001*\022\254\001\n\rStreamingRe"
+            + "ad\022\036.google.spanner.v1.ReadRequest\032#.goo"
+            + "gle.spanner.v1.PartialResultSet\"T\202\323\344\223\002N\""
+            + "I/v1/{session=projects/*/instances/*/dat"
+            + "abases/*/sessions/*}:streamingRead:\001*0\001\022"
+            + "\311\001\n\020BeginTransaction\022*.google.spanner.v1"
+            + ".BeginTransactionRequest\032\036.google.spanne"
+            + "r.v1.Transaction\"i\202\323\344\223\002Q\"L/v1/{session=p"
+            + "rojects/*/instances/*/databases/*/sessio"
+            + "ns/*}:beginTransaction:\001*\332A\017session,opti"
+            + "ons\022\353\001\n\006Commit\022 .google.spanner.v1.Commi"
+            + "tRequest\032!.google.spanner.v1.CommitRespo"
+            + "nse\"\233\001\202\323\344\223\002G\"B/v1/{session=projects/*/in"
+            + "stances/*/databases/*/sessions/*}:commit"
+            + ":\001*\332A session,transaction_id,mutations\332A"
+            + "(session,single_use_transaction,mutation"
+            + "s\022\260\001\n\010Rollback\022\".google.spanner.v1.Rollb"
+            + "ackRequest\032\026.google.protobuf.Empty\"h\202\323\344\223"
+            + "\002I\"D/v1/{session=projects/*/instances/*/"
+            + "databases/*/sessions/*}:rollback:\001*\332A\026se"
+            + "ssion,transaction_id\022\267\001\n\016PartitionQuery\022"
+            + "(.google.spanner.v1.PartitionQueryReques"
+            + "t\032$.google.spanner.v1.PartitionResponse\""
+            + "U\202\323\344\223\002O\"J/v1/{session=projects/*/instanc"
+            + "es/*/databases/*/sessions/*}:partitionQu"
+            + "ery:\001*\022\264\001\n\rPartitionRead\022\'.google.spanne"
+            + "r.v1.PartitionReadRequest\032$.google.spann"
+            + "er.v1.PartitionResponse\"T\202\323\344\223\002N\"I/v1/{se"
+            + "ssion=projects/*/instances/*/databases/*"
+            + "/sessions/*}:partitionRead:\001*\032w\312A\026spanne"
+            + "r.googleapis.com\322A[https://www.googleapi"
+            + "s.com/auth/cloud-platform,https://www.go"
+            + "ogleapis.com/auth/spanner.dataB\224\002\n\025com.g"
+            + "oogle.spanner.v1B\014SpannerProtoP\001Z8google"
+            + ".golang.org/genproto/googleapis/spanner/"
+            + "v1;spanner\252\002\027Google.Cloud.Spanner.V1\312\002\027G"
+            + "oogle\\Cloud\\Spanner\\V1\352\002\032Google::Cloud::"
+            + "Spanner::V1\352A_\n\037spanner.googleapis.com/D"
+            + "atabase\022();
+                fields_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              fields_.add(
-                  input.readMessage(
-                      com.google.spanner.v1.StructType.Field.parser(), extensionRegistry));
+              fields_.add(input.readMessage(Field.parser(), extensionRegistry));
               break;
             }
           default:
@@ -105,16 +103,13 @@ private StructType(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_StructType_descriptor;
+    return TypeProto.internal_static_google_spanner_v1_StructType_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.TypeProto
-        .internal_static_google_spanner_v1_StructType_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.StructType.class, com.google.spanner.v1.StructType.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return TypeProto.internal_static_google_spanner_v1_StructType_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(StructType.class, Builder.class);
   }
 
   public interface FieldOrBuilder
@@ -139,7 +134,7 @@ public interface FieldOrBuilder
      *
      * @return The name.
      */
-    java.lang.String getName();
+    String getName();
     /**
      *
      *
@@ -182,7 +177,7 @@ public interface FieldOrBuilder
      *
      * @return The type.
      */
-    com.google.spanner.v1.Type getType();
+    Type getType();
     /**
      *
      *
@@ -192,7 +187,7 @@ public interface FieldOrBuilder
      *
      * .google.spanner.v1.Type type = 2;
      */
-    com.google.spanner.v1.TypeOrBuilder getTypeOrBuilder();
+    TypeOrBuilder getTypeOrBuilder();
   }
   /**
    *
@@ -217,13 +212,13 @@ private Field() {
       name_ = "";
     }
 
-    @java.lang.Override
+    @Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected Object newInstance(UnusedPrivateParameter unused) {
       return new Field();
     }
 
-    @java.lang.Override
+    @Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -234,7 +229,7 @@ private Field(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -248,18 +243,18 @@ private Field(
               break;
             case 10:
               {
-                java.lang.String s = input.readStringRequireUtf8();
+                String s = input.readStringRequireUtf8();
 
                 name_ = s;
                 break;
               }
             case 18:
               {
-                com.google.spanner.v1.Type.Builder subBuilder = null;
+                Type.Builder subBuilder = null;
                 if (type_ != null) {
                   subBuilder = type_.toBuilder();
                 }
-                type_ = input.readMessage(com.google.spanner.v1.Type.parser(), extensionRegistry);
+                type_ = input.readMessage(Type.parser(), extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(type_);
                   type_ = subBuilder.buildPartial();
@@ -287,22 +282,17 @@ private Field(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.TypeProto
-          .internal_static_google_spanner_v1_StructType_Field_descriptor;
+      return TypeProto.internal_static_google_spanner_v1_StructType_Field_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.TypeProto
-          .internal_static_google_spanner_v1_StructType_Field_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.StructType.Field.class,
-              com.google.spanner.v1.StructType.Field.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return TypeProto.internal_static_google_spanner_v1_StructType_Field_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(Field.class, Builder.class);
     }
 
     public static final int NAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object name_;
+    private volatile Object name_;
     /**
      *
      *
@@ -320,14 +310,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      *
      * @return The name.
      */
-    @java.lang.Override
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
+    @Override
+    public String getName() {
+      Object ref = name_;
+      if (ref instanceof String) {
+        return (String) ref;
       } else {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         name_ = s;
         return s;
       }
@@ -349,12 +339,12 @@ public java.lang.String getName() {
      *
      * @return The bytes for name.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ByteString getNameBytes() {
-      java.lang.Object ref = name_;
-      if (ref instanceof java.lang.String) {
+      Object ref = name_;
+      if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         name_ = b;
         return b;
       } else {
@@ -363,7 +353,7 @@ public com.google.protobuf.ByteString getNameBytes() {
     }
 
     public static final int TYPE_FIELD_NUMBER = 2;
-    private com.google.spanner.v1.Type type_;
+    private Type type_;
     /**
      *
      *
@@ -375,7 +365,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * @return Whether the type field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasType() {
       return type_ != null;
     }
@@ -390,9 +380,9 @@ public boolean hasType() {
      *
      * @return The type.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.Type getType() {
-      return type_ == null ? com.google.spanner.v1.Type.getDefaultInstance() : type_;
+    @Override
+    public Type getType() {
+      return type_ == null ? Type.getDefaultInstance() : type_;
     }
     /**
      *
@@ -403,14 +393,14 @@ public com.google.spanner.v1.Type getType() {
      *
      * .google.spanner.v1.Type type = 2;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.TypeOrBuilder getTypeOrBuilder() {
+    @Override
+    public TypeOrBuilder getTypeOrBuilder() {
       return getType();
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -420,7 +410,7 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (!getNameBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
@@ -431,7 +421,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
+    @Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -448,15 +438,15 @@ public int getSerializedSize() {
       return size;
     }
 
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
+    @Override
+    public boolean equals(final Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof com.google.spanner.v1.StructType.Field)) {
+      if (!(obj instanceof Field)) {
         return super.equals(obj);
       }
-      com.google.spanner.v1.StructType.Field other = (com.google.spanner.v1.StructType.Field) obj;
+      Field other = (Field) obj;
 
       if (!getName().equals(other.getName())) return false;
       if (hasType() != other.hasType()) return false;
@@ -467,7 +457,7 @@ public boolean equals(final java.lang.Object obj) {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -485,71 +475,68 @@ public int hashCode() {
       return hash;
     }
 
-    public static com.google.spanner.v1.StructType.Field parseFrom(java.nio.ByteBuffer data)
+    public static Field parseFrom(java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.StructType.Field parseFrom(
+    public static Field parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.StructType.Field parseFrom(
-        com.google.protobuf.ByteString data)
+    public static Field parseFrom(com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.StructType.Field parseFrom(
+    public static Field 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.spanner.v1.StructType.Field parseFrom(byte[] data)
+    public static Field parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.StructType.Field parseFrom(
+    public static Field parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.StructType.Field parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
+    public static Field parseFrom(java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.StructType.Field parseFrom(
+    public static Field 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.spanner.v1.StructType.Field parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
+    public static Field parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.StructType.Field parseDelimitedFrom(
+    public static Field 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.spanner.v1.StructType.Field parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    public static Field parseFrom(com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.StructType.Field parseFrom(
+    public static Field parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -557,7 +544,7 @@ public static com.google.spanner.v1.StructType.Field parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
+    @Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -566,18 +553,17 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(com.google.spanner.v1.StructType.Field prototype) {
+    public static Builder newBuilder(Field prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @java.lang.Override
+    @Override
     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) {
+    @Override
+    protected Builder newBuilderForType(BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -594,20 +580,15 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.StructType.Field)
-        com.google.spanner.v1.StructType.FieldOrBuilder {
+        FieldOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return com.google.spanner.v1.TypeProto
-            .internal_static_google_spanner_v1_StructType_Field_descriptor;
+        return TypeProto.internal_static_google_spanner_v1_StructType_Field_descriptor;
       }
 
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.spanner.v1.TypeProto
-            .internal_static_google_spanner_v1_StructType_Field_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.spanner.v1.StructType.Field.class,
-                com.google.spanner.v1.StructType.Field.Builder.class);
+      @Override
+      protected FieldAccessorTable internalGetFieldAccessorTable() {
+        return TypeProto.internal_static_google_spanner_v1_StructType_Field_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(Field.class, Builder.class);
       }
 
       // Construct using com.google.spanner.v1.StructType.Field.newBuilder()
@@ -615,7 +596,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -624,7 +605,7 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @java.lang.Override
+      @Override
       public Builder clear() {
         super.clear();
         name_ = "";
@@ -638,30 +619,28 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return com.google.spanner.v1.TypeProto
-            .internal_static_google_spanner_v1_StructType_Field_descriptor;
+        return TypeProto.internal_static_google_spanner_v1_StructType_Field_descriptor;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.StructType.Field getDefaultInstanceForType() {
-        return com.google.spanner.v1.StructType.Field.getDefaultInstance();
+      @Override
+      public Field getDefaultInstanceForType() {
+        return Field.getDefaultInstance();
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.StructType.Field build() {
-        com.google.spanner.v1.StructType.Field result = buildPartial();
+      @Override
+      public Field build() {
+        Field result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.StructType.Field buildPartial() {
-        com.google.spanner.v1.StructType.Field result =
-            new com.google.spanner.v1.StructType.Field(this);
+      @Override
+      public Field buildPartial() {
+        Field result = new Field(this);
         result.name_ = name_;
         if (typeBuilder_ == null) {
           result.type_ = type_;
@@ -672,53 +651,50 @@ public com.google.spanner.v1.StructType.Field buildPartial() {
         return result;
       }
 
-      @java.lang.Override
+      @Override
       public Builder clone() {
         return super.clone();
       }
 
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      @Override
+      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.setField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @java.lang.Override
+      @Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.spanner.v1.StructType.Field) {
-          return mergeFrom((com.google.spanner.v1.StructType.Field) other);
+        if (other instanceof Field) {
+          return mergeFrom((Field) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.google.spanner.v1.StructType.Field other) {
-        if (other == com.google.spanner.v1.StructType.Field.getDefaultInstance()) return this;
+      public Builder mergeFrom(Field other) {
+        if (other == Field.getDefaultInstance()) return this;
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
           onChanged();
@@ -731,21 +707,21 @@ public Builder mergeFrom(com.google.spanner.v1.StructType.Field other) {
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.spanner.v1.StructType.Field parsedMessage = null;
+        Field parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.spanner.v1.StructType.Field) e.getUnfinishedMessage();
+          parsedMessage = (Field) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -755,7 +731,7 @@ public Builder mergeFrom(
         return this;
       }
 
-      private java.lang.Object name_ = "";
+      private Object name_ = "";
       /**
        *
        *
@@ -773,15 +749,15 @@ public Builder mergeFrom(
        *
        * @return The name.
        */
-      public java.lang.String getName() {
-        java.lang.Object ref = name_;
-        if (!(ref instanceof java.lang.String)) {
+      public String getName() {
+        Object ref = name_;
+        if (!(ref instanceof String)) {
           com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
+          String s = bs.toStringUtf8();
           name_ = s;
           return s;
         } else {
-          return (java.lang.String) ref;
+          return (String) ref;
         }
       }
       /**
@@ -802,10 +778,10 @@ public java.lang.String getName() {
        * @return The bytes for name.
        */
       public com.google.protobuf.ByteString getNameBytes() {
-        java.lang.Object ref = name_;
+        Object ref = name_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+              com.google.protobuf.ByteString.copyFromUtf8((String) ref);
           name_ = b;
           return b;
         } else {
@@ -830,7 +806,7 @@ public com.google.protobuf.ByteString getNameBytes() {
        * @param value The name to set.
        * @return This builder for chaining.
        */
-      public Builder setName(java.lang.String value) {
+      public Builder setName(String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -891,11 +867,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private com.google.spanner.v1.Type type_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-              com.google.spanner.v1.Type,
-              com.google.spanner.v1.Type.Builder,
-              com.google.spanner.v1.TypeOrBuilder>
+      private Type type_;
+      private com.google.protobuf.SingleFieldBuilderV3
           typeBuilder_;
       /**
        *
@@ -922,9 +895,9 @@ public boolean hasType() {
        *
        * @return The type.
        */
-      public com.google.spanner.v1.Type getType() {
+      public Type getType() {
         if (typeBuilder_ == null) {
-          return type_ == null ? com.google.spanner.v1.Type.getDefaultInstance() : type_;
+          return type_ == null ? Type.getDefaultInstance() : type_;
         } else {
           return typeBuilder_.getMessage();
         }
@@ -938,7 +911,7 @@ public com.google.spanner.v1.Type getType() {
        *
        * .google.spanner.v1.Type type = 2;
        */
-      public Builder setType(com.google.spanner.v1.Type value) {
+      public Builder setType(Type value) {
         if (typeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -960,7 +933,7 @@ public Builder setType(com.google.spanner.v1.Type value) {
        *
        * .google.spanner.v1.Type type = 2;
        */
-      public Builder setType(com.google.spanner.v1.Type.Builder builderForValue) {
+      public Builder setType(Type.Builder builderForValue) {
         if (typeBuilder_ == null) {
           type_ = builderForValue.build();
           onChanged();
@@ -979,10 +952,10 @@ public Builder setType(com.google.spanner.v1.Type.Builder builderForValue) {
        *
        * .google.spanner.v1.Type type = 2;
        */
-      public Builder mergeType(com.google.spanner.v1.Type value) {
+      public Builder mergeType(Type value) {
         if (typeBuilder_ == null) {
           if (type_ != null) {
-            type_ = com.google.spanner.v1.Type.newBuilder(type_).mergeFrom(value).buildPartial();
+            type_ = Type.newBuilder(type_).mergeFrom(value).buildPartial();
           } else {
             type_ = value;
           }
@@ -1022,7 +995,7 @@ public Builder clearType() {
        *
        * .google.spanner.v1.Type type = 2;
        */
-      public com.google.spanner.v1.Type.Builder getTypeBuilder() {
+      public Type.Builder getTypeBuilder() {
 
         onChanged();
         return getTypeFieldBuilder().getBuilder();
@@ -1036,11 +1009,11 @@ public com.google.spanner.v1.Type.Builder getTypeBuilder() {
        *
        * .google.spanner.v1.Type type = 2;
        */
-      public com.google.spanner.v1.TypeOrBuilder getTypeOrBuilder() {
+      public TypeOrBuilder getTypeOrBuilder() {
         if (typeBuilder_ != null) {
           return typeBuilder_.getMessageOrBuilder();
         } else {
-          return type_ == null ? com.google.spanner.v1.Type.getDefaultInstance() : type_;
+          return type_ == null ? Type.getDefaultInstance() : type_;
         }
       }
       /**
@@ -1052,30 +1025,24 @@ public com.google.spanner.v1.TypeOrBuilder getTypeOrBuilder() {
        *
        * .google.spanner.v1.Type type = 2;
        */
-      private com.google.protobuf.SingleFieldBuilderV3<
-              com.google.spanner.v1.Type,
-              com.google.spanner.v1.Type.Builder,
-              com.google.spanner.v1.TypeOrBuilder>
+      private com.google.protobuf.SingleFieldBuilderV3
           getTypeFieldBuilder() {
         if (typeBuilder_ == null) {
           typeBuilder_ =
-              new com.google.protobuf.SingleFieldBuilderV3<
-                  com.google.spanner.v1.Type,
-                  com.google.spanner.v1.Type.Builder,
-                  com.google.spanner.v1.TypeOrBuilder>(
+              new com.google.protobuf.SingleFieldBuilderV3(
                   getType(), getParentForChildren(), isClean());
           type_ = null;
         }
         return typeBuilder_;
       }
 
-      @java.lang.Override
+      @Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @java.lang.Override
+      @Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1085,19 +1052,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.StructType.Field)
-    private static final com.google.spanner.v1.StructType.Field DEFAULT_INSTANCE;
+    private static final Field DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new com.google.spanner.v1.StructType.Field();
+      DEFAULT_INSTANCE = new Field();
     }
 
-    public static com.google.spanner.v1.StructType.Field getDefaultInstance() {
+    public static Field getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @java.lang.Override
+          @Override
           public Field parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1110,19 +1077,19 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.StructType.Field getDefaultInstanceForType() {
+    @Override
+    public Field getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
 
   public static final int FIELDS_FIELD_NUMBER = 1;
-  private java.util.List fields_;
+  private java.util.List fields_;
   /**
    *
    *
@@ -1137,8 +1104,8 @@ public com.google.spanner.v1.StructType.Field getDefaultInstanceForType() {
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  @java.lang.Override
-  public java.util.List getFieldsList() {
+  @Override
+  public java.util.List getFieldsList() {
     return fields_;
   }
   /**
@@ -1155,9 +1122,8 @@ public java.util.List getFieldsList() {
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  @java.lang.Override
-  public java.util.List
-      getFieldsOrBuilderList() {
+  @Override
+  public java.util.List getFieldsOrBuilderList() {
     return fields_;
   }
   /**
@@ -1174,7 +1140,7 @@ public java.util.List getFieldsList() {
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  @java.lang.Override
+  @Override
   public int getFieldsCount() {
     return fields_.size();
   }
@@ -1192,8 +1158,8 @@ public int getFieldsCount() {
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.StructType.Field getFields(int index) {
+  @Override
+  public Field getFields(int index) {
     return fields_.get(index);
   }
   /**
@@ -1210,14 +1176,14 @@ public com.google.spanner.v1.StructType.Field getFields(int index) {
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.StructType.FieldOrBuilder getFieldsOrBuilder(int index) {
+  @Override
+  public FieldOrBuilder getFieldsOrBuilder(int index) {
     return fields_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1227,7 +1193,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   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));
@@ -1235,7 +1201,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1249,22 +1215,22 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.StructType)) {
+    if (!(obj instanceof StructType)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.StructType other = (com.google.spanner.v1.StructType) obj;
+    StructType other = (StructType) obj;
 
     if (!getFieldsList().equals(other.getFieldsList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -1280,70 +1246,69 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.StructType parseFrom(java.nio.ByteBuffer data)
+  public static StructType parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.StructType parseFrom(
+  public static StructType parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.StructType parseFrom(com.google.protobuf.ByteString data)
+  public static StructType parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.StructType parseFrom(
+  public static StructType 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.spanner.v1.StructType parseFrom(byte[] data)
+  public static StructType parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.StructType parseFrom(
+  public static StructType parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.StructType parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static StructType parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.StructType parseFrom(
+  public static StructType 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.spanner.v1.StructType parseDelimitedFrom(java.io.InputStream input)
+  public static StructType parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.StructType parseDelimitedFrom(
+  public static StructType 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.spanner.v1.StructType parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static StructType parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.StructType parseFrom(
+  public static StructType parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -1351,7 +1316,7 @@ public static com.google.spanner.v1.StructType parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -1360,17 +1325,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.StructType prototype) {
+  public static Builder newBuilder(StructType prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -1386,20 +1351,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.StructType)
-      com.google.spanner.v1.StructTypeOrBuilder {
+      StructTypeOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.TypeProto
-          .internal_static_google_spanner_v1_StructType_descriptor;
+      return TypeProto.internal_static_google_spanner_v1_StructType_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.TypeProto
-          .internal_static_google_spanner_v1_StructType_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.StructType.class,
-              com.google.spanner.v1.StructType.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return TypeProto.internal_static_google_spanner_v1_StructType_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(StructType.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.StructType.newBuilder()
@@ -1407,7 +1367,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -1418,7 +1378,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       if (fieldsBuilder_ == null) {
@@ -1430,29 +1390,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.TypeProto
-          .internal_static_google_spanner_v1_StructType_descriptor;
+      return TypeProto.internal_static_google_spanner_v1_StructType_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.StructType getDefaultInstanceForType() {
-      return com.google.spanner.v1.StructType.getDefaultInstance();
+    @Override
+    public StructType getDefaultInstanceForType() {
+      return StructType.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.StructType build() {
-      com.google.spanner.v1.StructType result = buildPartial();
+    @Override
+    public StructType build() {
+      StructType result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.StructType buildPartial() {
-      com.google.spanner.v1.StructType result = new com.google.spanner.v1.StructType(this);
+    @Override
+    public StructType buildPartial() {
+      StructType result = new StructType(this);
       int from_bitField0_ = bitField0_;
       if (fieldsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -1467,51 +1426,50 @@ public com.google.spanner.v1.StructType buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.StructType) {
-        return mergeFrom((com.google.spanner.v1.StructType) other);
+      if (other instanceof StructType) {
+        return mergeFrom((StructType) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.StructType other) {
-      if (other == com.google.spanner.v1.StructType.getDefaultInstance()) return this;
+    public Builder mergeFrom(StructType other) {
+      if (other == StructType.getDefaultInstance()) return this;
       if (fieldsBuilder_ == null) {
         if (!other.fields_.isEmpty()) {
           if (fields_.isEmpty()) {
@@ -1544,21 +1502,21 @@ public Builder mergeFrom(com.google.spanner.v1.StructType other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.StructType parsedMessage = null;
+      StructType parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.StructType) e.getUnfinishedMessage();
+        parsedMessage = (StructType) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -1570,20 +1528,16 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.util.List fields_ =
-        java.util.Collections.emptyList();
+    private java.util.List fields_ = java.util.Collections.emptyList();
 
     private void ensureFieldsIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        fields_ = new java.util.ArrayList(fields_);
+        fields_ = new java.util.ArrayList(fields_);
         bitField0_ |= 0x00000001;
       }
     }
 
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.StructType.Field,
-            com.google.spanner.v1.StructType.Field.Builder,
-            com.google.spanner.v1.StructType.FieldOrBuilder>
+    private com.google.protobuf.RepeatedFieldBuilderV3
         fieldsBuilder_;
 
     /**
@@ -1600,7 +1554,7 @@ private void ensureFieldsIsMutable() {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public java.util.List getFieldsList() {
+    public java.util.List getFieldsList() {
       if (fieldsBuilder_ == null) {
         return java.util.Collections.unmodifiableList(fields_);
       } else {
@@ -1642,7 +1596,7 @@ public int getFieldsCount() {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public com.google.spanner.v1.StructType.Field getFields(int index) {
+    public Field getFields(int index) {
       if (fieldsBuilder_ == null) {
         return fields_.get(index);
       } else {
@@ -1663,7 +1617,7 @@ public com.google.spanner.v1.StructType.Field getFields(int index) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder setFields(int index, com.google.spanner.v1.StructType.Field value) {
+    public Builder setFields(int index, Field value) {
       if (fieldsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1690,8 +1644,7 @@ public Builder setFields(int index, com.google.spanner.v1.StructType.Field value
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder setFields(
-        int index, com.google.spanner.v1.StructType.Field.Builder builderForValue) {
+    public Builder setFields(int index, Field.Builder builderForValue) {
       if (fieldsBuilder_ == null) {
         ensureFieldsIsMutable();
         fields_.set(index, builderForValue.build());
@@ -1715,7 +1668,7 @@ public Builder setFields(
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder addFields(com.google.spanner.v1.StructType.Field value) {
+    public Builder addFields(Field value) {
       if (fieldsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1742,7 +1695,7 @@ public Builder addFields(com.google.spanner.v1.StructType.Field value) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder addFields(int index, com.google.spanner.v1.StructType.Field value) {
+    public Builder addFields(int index, Field value) {
       if (fieldsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1769,7 +1722,7 @@ public Builder addFields(int index, com.google.spanner.v1.StructType.Field value
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder addFields(com.google.spanner.v1.StructType.Field.Builder builderForValue) {
+    public Builder addFields(Field.Builder builderForValue) {
       if (fieldsBuilder_ == null) {
         ensureFieldsIsMutable();
         fields_.add(builderForValue.build());
@@ -1793,8 +1746,7 @@ public Builder addFields(com.google.spanner.v1.StructType.Field.Builder builderF
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder addFields(
-        int index, com.google.spanner.v1.StructType.Field.Builder builderForValue) {
+    public Builder addFields(int index, Field.Builder builderForValue) {
       if (fieldsBuilder_ == null) {
         ensureFieldsIsMutable();
         fields_.add(index, builderForValue.build());
@@ -1818,8 +1770,7 @@ public Builder addFields(
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder addAllFields(
-        java.lang.Iterable values) {
+    public Builder addAllFields(Iterable values) {
       if (fieldsBuilder_ == null) {
         ensureFieldsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, fields_);
@@ -1891,7 +1842,7 @@ public Builder removeFields(int index) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public com.google.spanner.v1.StructType.Field.Builder getFieldsBuilder(int index) {
+    public Field.Builder getFieldsBuilder(int index) {
       return getFieldsFieldBuilder().getBuilder(index);
     }
     /**
@@ -1908,7 +1859,7 @@ public com.google.spanner.v1.StructType.Field.Builder getFieldsBuilder(int index
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public com.google.spanner.v1.StructType.FieldOrBuilder getFieldsOrBuilder(int index) {
+    public FieldOrBuilder getFieldsOrBuilder(int index) {
       if (fieldsBuilder_ == null) {
         return fields_.get(index);
       } else {
@@ -1929,8 +1880,7 @@ public com.google.spanner.v1.StructType.FieldOrBuilder getFieldsOrBuilder(int in
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public java.util.List
-        getFieldsOrBuilderList() {
+    public java.util.List getFieldsOrBuilderList() {
       if (fieldsBuilder_ != null) {
         return fieldsBuilder_.getMessageOrBuilderList();
       } else {
@@ -1951,9 +1901,8 @@ public com.google.spanner.v1.StructType.FieldOrBuilder getFieldsOrBuilder(int in
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public com.google.spanner.v1.StructType.Field.Builder addFieldsBuilder() {
-      return getFieldsFieldBuilder()
-          .addBuilder(com.google.spanner.v1.StructType.Field.getDefaultInstance());
+    public Field.Builder addFieldsBuilder() {
+      return getFieldsFieldBuilder().addBuilder(Field.getDefaultInstance());
     }
     /**
      *
@@ -1969,9 +1918,8 @@ public com.google.spanner.v1.StructType.Field.Builder addFieldsBuilder() {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public com.google.spanner.v1.StructType.Field.Builder addFieldsBuilder(int index) {
-      return getFieldsFieldBuilder()
-          .addBuilder(index, com.google.spanner.v1.StructType.Field.getDefaultInstance());
+    public Field.Builder addFieldsBuilder(int index) {
+      return getFieldsFieldBuilder().addBuilder(index, Field.getDefaultInstance());
     }
     /**
      *
@@ -1987,33 +1935,27 @@ public com.google.spanner.v1.StructType.Field.Builder addFieldsBuilder(int index
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public java.util.List getFieldsBuilderList() {
+    public java.util.List getFieldsBuilderList() {
       return getFieldsFieldBuilder().getBuilderList();
     }
 
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.spanner.v1.StructType.Field,
-            com.google.spanner.v1.StructType.Field.Builder,
-            com.google.spanner.v1.StructType.FieldOrBuilder>
+    private com.google.protobuf.RepeatedFieldBuilderV3
         getFieldsFieldBuilder() {
       if (fieldsBuilder_ == null) {
         fieldsBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.spanner.v1.StructType.Field,
-                com.google.spanner.v1.StructType.Field.Builder,
-                com.google.spanner.v1.StructType.FieldOrBuilder>(
+            new com.google.protobuf.RepeatedFieldBuilderV3(
                 fields_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         fields_ = null;
       }
       return fieldsBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2023,19 +1965,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.StructType)
-  private static final com.google.spanner.v1.StructType DEFAULT_INSTANCE;
+  private static final StructType DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.StructType();
+    DEFAULT_INSTANCE = new StructType();
   }
 
-  public static com.google.spanner.v1.StructType getDefaultInstance() {
+  public static StructType getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public StructType parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2048,13 +1990,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.StructType getDefaultInstanceForType() {
+  @Override
+  public StructType getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructTypeOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructTypeOrBuilder.java
index 97d70e9b0d..2c1e88bd75 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructTypeOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructTypeOrBuilder.java
@@ -37,7 +37,7 @@ public interface StructTypeOrBuilder
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  java.util.List getFieldsList();
+  java.util.List getFieldsList();
   /**
    *
    *
@@ -52,7 +52,7 @@ public interface StructTypeOrBuilder
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  com.google.spanner.v1.StructType.Field getFields(int index);
+  StructType.Field getFields(int index);
   /**
    *
    *
@@ -82,8 +82,7 @@ public interface StructTypeOrBuilder
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  java.util.List
-      getFieldsOrBuilderList();
+  java.util.List getFieldsOrBuilderList();
   /**
    *
    *
@@ -98,5 +97,5 @@ public interface StructTypeOrBuilder
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  com.google.spanner.v1.StructType.FieldOrBuilder getFieldsOrBuilder(int index);
+  StructType.FieldOrBuilder getFieldsOrBuilder(int index);
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java
index be57d6c504..64845fae5d 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java
@@ -41,13 +41,13 @@ private Transaction() {
     id_ = com.google.protobuf.ByteString.EMPTY;
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new Transaction();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private Transaction(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -110,18 +110,13 @@ private Transaction(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.TransactionProto
-        .internal_static_google_spanner_v1_Transaction_descriptor;
+    return TransactionProto.internal_static_google_spanner_v1_Transaction_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.TransactionProto
-        .internal_static_google_spanner_v1_Transaction_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.Transaction.class,
-            com.google.spanner.v1.Transaction.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return TransactionProto.internal_static_google_spanner_v1_Transaction_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(Transaction.class, Builder.class);
   }
 
   public static final int ID_FIELD_NUMBER = 1;
@@ -143,7 +138,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The id.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ByteString getId() {
     return id_;
   }
@@ -165,7 +160,7 @@ public com.google.protobuf.ByteString getId() {
    *
    * @return Whether the readTimestamp field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasReadTimestamp() {
     return readTimestamp_ != null;
   }
@@ -184,7 +179,7 @@ public boolean hasReadTimestamp() {
    *
    * @return The readTimestamp.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Timestamp getReadTimestamp() {
     return readTimestamp_ == null
         ? com.google.protobuf.Timestamp.getDefaultInstance()
@@ -203,14 +198,14 @@ public com.google.protobuf.Timestamp getReadTimestamp() {
    *
    * .google.protobuf.Timestamp read_timestamp = 2;
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
     return getReadTimestamp();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -220,7 +215,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!id_.isEmpty()) {
       output.writeBytes(1, id_);
@@ -231,7 +226,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -248,15 +243,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.Transaction)) {
+    if (!(obj instanceof Transaction)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.Transaction other = (com.google.spanner.v1.Transaction) obj;
+    Transaction other = (Transaction) obj;
 
     if (!getId().equals(other.getId())) return false;
     if (hasReadTimestamp() != other.hasReadTimestamp()) return false;
@@ -267,7 +262,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -285,70 +280,69 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.Transaction parseFrom(java.nio.ByteBuffer data)
+  public static Transaction parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Transaction parseFrom(
+  public static Transaction parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.Transaction parseFrom(com.google.protobuf.ByteString data)
+  public static Transaction parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Transaction parseFrom(
+  public static Transaction 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.spanner.v1.Transaction parseFrom(byte[] data)
+  public static Transaction parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Transaction parseFrom(
+  public static Transaction parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.Transaction parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static Transaction parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Transaction parseFrom(
+  public static Transaction 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.spanner.v1.Transaction parseDelimitedFrom(java.io.InputStream input)
+  public static Transaction parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Transaction parseDelimitedFrom(
+  public static Transaction 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.spanner.v1.Transaction parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static Transaction parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Transaction parseFrom(
+  public static Transaction parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -356,7 +350,7 @@ public static com.google.spanner.v1.Transaction parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -365,17 +359,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.Transaction prototype) {
+  public static Builder newBuilder(Transaction prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -391,20 +385,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.Transaction)
-      com.google.spanner.v1.TransactionOrBuilder {
+      TransactionOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.TransactionProto
-          .internal_static_google_spanner_v1_Transaction_descriptor;
+      return TransactionProto.internal_static_google_spanner_v1_Transaction_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.TransactionProto
-          .internal_static_google_spanner_v1_Transaction_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.Transaction.class,
-              com.google.spanner.v1.Transaction.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return TransactionProto.internal_static_google_spanner_v1_Transaction_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(Transaction.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.Transaction.newBuilder()
@@ -412,7 +401,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -421,7 +410,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       id_ = com.google.protobuf.ByteString.EMPTY;
@@ -435,29 +424,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.TransactionProto
-          .internal_static_google_spanner_v1_Transaction_descriptor;
+      return TransactionProto.internal_static_google_spanner_v1_Transaction_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Transaction getDefaultInstanceForType() {
-      return com.google.spanner.v1.Transaction.getDefaultInstance();
+    @Override
+    public Transaction getDefaultInstanceForType() {
+      return Transaction.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Transaction build() {
-      com.google.spanner.v1.Transaction result = buildPartial();
+    @Override
+    public Transaction build() {
+      Transaction result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Transaction buildPartial() {
-      com.google.spanner.v1.Transaction result = new com.google.spanner.v1.Transaction(this);
+    @Override
+    public Transaction buildPartial() {
+      Transaction result = new Transaction(this);
       result.id_ = id_;
       if (readTimestampBuilder_ == null) {
         result.readTimestamp_ = readTimestamp_;
@@ -468,51 +456,50 @@ public com.google.spanner.v1.Transaction buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.Transaction) {
-        return mergeFrom((com.google.spanner.v1.Transaction) other);
+      if (other instanceof Transaction) {
+        return mergeFrom((Transaction) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.Transaction other) {
-      if (other == com.google.spanner.v1.Transaction.getDefaultInstance()) return this;
+    public Builder mergeFrom(Transaction other) {
+      if (other == Transaction.getDefaultInstance()) return this;
       if (other.getId() != com.google.protobuf.ByteString.EMPTY) {
         setId(other.getId());
       }
@@ -524,21 +511,21 @@ public Builder mergeFrom(com.google.spanner.v1.Transaction other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.Transaction parsedMessage = null;
+      Transaction parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.Transaction) e.getUnfinishedMessage();
+        parsedMessage = (Transaction) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -566,7 +553,7 @@ public Builder mergeFrom(
      *
      * @return The id.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.ByteString getId() {
       return id_;
     }
@@ -842,12 +829,12 @@ public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
       return readTimestampBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -857,19 +844,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.Transaction)
-  private static final com.google.spanner.v1.Transaction DEFAULT_INSTANCE;
+  private static final Transaction DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.Transaction();
+    DEFAULT_INSTANCE = new Transaction();
   }
 
-  public static com.google.spanner.v1.Transaction getDefaultInstance() {
+  public static Transaction getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public Transaction parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -882,13 +869,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.Transaction getDefaultInstanceForType() {
+  @Override
+  public Transaction getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java
index 3c4cba6827..c04885b2b7 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java
@@ -254,13 +254,13 @@ private TransactionOptions(com.google.protobuf.GeneratedMessageV3.Builder bui
 
   private TransactionOptions() {}
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new TransactionOptions();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -271,7 +271,7 @@ private TransactionOptions(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -285,17 +285,13 @@ private TransactionOptions(
             break;
           case 10:
             {
-              com.google.spanner.v1.TransactionOptions.ReadWrite.Builder subBuilder = null;
+              ReadWrite.Builder subBuilder = null;
               if (modeCase_ == 1) {
-                subBuilder =
-                    ((com.google.spanner.v1.TransactionOptions.ReadWrite) mode_).toBuilder();
+                subBuilder = ((ReadWrite) mode_).toBuilder();
               }
-              mode_ =
-                  input.readMessage(
-                      com.google.spanner.v1.TransactionOptions.ReadWrite.parser(),
-                      extensionRegistry);
+              mode_ = input.readMessage(ReadWrite.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.spanner.v1.TransactionOptions.ReadWrite) mode_);
+                subBuilder.mergeFrom((ReadWrite) mode_);
                 mode_ = subBuilder.buildPartial();
               }
               modeCase_ = 1;
@@ -303,17 +299,13 @@ private TransactionOptions(
             }
           case 18:
             {
-              com.google.spanner.v1.TransactionOptions.ReadOnly.Builder subBuilder = null;
+              ReadOnly.Builder subBuilder = null;
               if (modeCase_ == 2) {
-                subBuilder =
-                    ((com.google.spanner.v1.TransactionOptions.ReadOnly) mode_).toBuilder();
+                subBuilder = ((ReadOnly) mode_).toBuilder();
               }
-              mode_ =
-                  input.readMessage(
-                      com.google.spanner.v1.TransactionOptions.ReadOnly.parser(),
-                      extensionRegistry);
+              mode_ = input.readMessage(ReadOnly.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.spanner.v1.TransactionOptions.ReadOnly) mode_);
+                subBuilder.mergeFrom((ReadOnly) mode_);
                 mode_ = subBuilder.buildPartial();
               }
               modeCase_ = 2;
@@ -321,18 +313,13 @@ private TransactionOptions(
             }
           case 26:
             {
-              com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder subBuilder = null;
+              PartitionedDml.Builder subBuilder = null;
               if (modeCase_ == 3) {
-                subBuilder =
-                    ((com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_).toBuilder();
+                subBuilder = ((PartitionedDml) mode_).toBuilder();
               }
-              mode_ =
-                  input.readMessage(
-                      com.google.spanner.v1.TransactionOptions.PartitionedDml.parser(),
-                      extensionRegistry);
+              mode_ = input.readMessage(PartitionedDml.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(
-                    (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_);
+                subBuilder.mergeFrom((PartitionedDml) mode_);
                 mode_ = subBuilder.buildPartial();
               }
               modeCase_ = 3;
@@ -358,18 +345,13 @@ private TransactionOptions(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.TransactionProto
-        .internal_static_google_spanner_v1_TransactionOptions_descriptor;
+    return TransactionProto.internal_static_google_spanner_v1_TransactionOptions_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.TransactionProto
-        .internal_static_google_spanner_v1_TransactionOptions_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.TransactionOptions.class,
-            com.google.spanner.v1.TransactionOptions.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return TransactionProto.internal_static_google_spanner_v1_TransactionOptions_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(TransactionOptions.class, Builder.class);
   }
 
   public interface ReadWriteOrBuilder
@@ -398,13 +380,13 @@ private ReadWrite(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
     private ReadWrite() {}
 
-    @java.lang.Override
+    @Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected Object newInstance(UnusedPrivateParameter unused) {
       return new ReadWrite();
     }
 
-    @java.lang.Override
+    @Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -415,7 +397,7 @@ private ReadWrite(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -447,23 +429,20 @@ private ReadWrite(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.TransactionProto
+      return TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_ReadWrite_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.TransactionProto
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_ReadWrite_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.TransactionOptions.ReadWrite.class,
-              com.google.spanner.v1.TransactionOptions.ReadWrite.Builder.class);
+          .ensureFieldAccessorsInitialized(ReadWrite.class, Builder.class);
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -473,12 +452,12 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
+    @Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -489,22 +468,21 @@ public int getSerializedSize() {
       return size;
     }
 
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
+    @Override
+    public boolean equals(final Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof com.google.spanner.v1.TransactionOptions.ReadWrite)) {
+      if (!(obj instanceof ReadWrite)) {
         return super.equals(obj);
       }
-      com.google.spanner.v1.TransactionOptions.ReadWrite other =
-          (com.google.spanner.v1.TransactionOptions.ReadWrite) obj;
+      ReadWrite other = (ReadWrite) obj;
 
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -516,71 +494,69 @@ public int hashCode() {
       return hash;
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static ReadWrite parseFrom(java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
+    public static ReadWrite parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
-        com.google.protobuf.ByteString data)
+    public static ReadWrite parseFrom(com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
+    public static ReadWrite 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.spanner.v1.TransactionOptions.ReadWrite parseFrom(byte[] data)
+    public static ReadWrite parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
+    public static ReadWrite parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
+    public static ReadWrite parseFrom(java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
+    public static ReadWrite 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.spanner.v1.TransactionOptions.ReadWrite parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
+    public static ReadWrite parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseDelimitedFrom(
+    public static ReadWrite 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.spanner.v1.TransactionOptions.ReadWrite parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    public static ReadWrite parseFrom(com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
+    public static ReadWrite parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -588,7 +564,7 @@ public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
+    @Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -597,18 +573,17 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(com.google.spanner.v1.TransactionOptions.ReadWrite prototype) {
+    public static Builder newBuilder(ReadWrite prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @java.lang.Override
+    @Override
     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) {
+    @Override
+    protected Builder newBuilderForType(BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -626,20 +601,17 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.TransactionOptions.ReadWrite)
-        com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder {
+        ReadWriteOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return com.google.spanner.v1.TransactionProto
+        return TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_ReadWrite_descriptor;
       }
 
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.spanner.v1.TransactionProto
+      @Override
+      protected FieldAccessorTable internalGetFieldAccessorTable() {
+        return TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_ReadWrite_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.spanner.v1.TransactionOptions.ReadWrite.class,
-                com.google.spanner.v1.TransactionOptions.ReadWrite.Builder.class);
+            .ensureFieldAccessorsInitialized(ReadWrite.class, Builder.class);
       }
 
       // Construct using com.google.spanner.v1.TransactionOptions.ReadWrite.newBuilder()
@@ -647,7 +619,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -656,109 +628,103 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @java.lang.Override
+      @Override
       public Builder clear() {
         super.clear();
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return com.google.spanner.v1.TransactionProto
+        return TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_ReadWrite_descriptor;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() {
-        return com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
+      @Override
+      public ReadWrite getDefaultInstanceForType() {
+        return ReadWrite.getDefaultInstance();
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.TransactionOptions.ReadWrite build() {
-        com.google.spanner.v1.TransactionOptions.ReadWrite result = buildPartial();
+      @Override
+      public ReadWrite build() {
+        ReadWrite result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.TransactionOptions.ReadWrite buildPartial() {
-        com.google.spanner.v1.TransactionOptions.ReadWrite result =
-            new com.google.spanner.v1.TransactionOptions.ReadWrite(this);
+      @Override
+      public ReadWrite buildPartial() {
+        ReadWrite result = new ReadWrite(this);
         onBuilt();
         return result;
       }
 
-      @java.lang.Override
+      @Override
       public Builder clone() {
         return super.clone();
       }
 
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      @Override
+      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.setField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @java.lang.Override
+      @Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.spanner.v1.TransactionOptions.ReadWrite) {
-          return mergeFrom((com.google.spanner.v1.TransactionOptions.ReadWrite) other);
+        if (other instanceof ReadWrite) {
+          return mergeFrom((ReadWrite) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.google.spanner.v1.TransactionOptions.ReadWrite other) {
-        if (other == com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance())
-          return this;
+      public Builder mergeFrom(ReadWrite other) {
+        if (other == ReadWrite.getDefaultInstance()) return this;
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.spanner.v1.TransactionOptions.ReadWrite parsedMessage = null;
+        ReadWrite parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (com.google.spanner.v1.TransactionOptions.ReadWrite) e.getUnfinishedMessage();
+          parsedMessage = (ReadWrite) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -768,13 +734,13 @@ public Builder mergeFrom(
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @java.lang.Override
+      @Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -784,19 +750,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.TransactionOptions.ReadWrite)
-    private static final com.google.spanner.v1.TransactionOptions.ReadWrite DEFAULT_INSTANCE;
+    private static final ReadWrite DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new com.google.spanner.v1.TransactionOptions.ReadWrite();
+      DEFAULT_INSTANCE = new ReadWrite();
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadWrite getDefaultInstance() {
+    public static ReadWrite getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @java.lang.Override
+          @Override
           public ReadWrite parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -809,13 +775,13 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() {
+    @Override
+    public ReadWrite getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
@@ -845,13 +811,13 @@ private PartitionedDml(com.google.protobuf.GeneratedMessageV3.Builder builder
 
     private PartitionedDml() {}
 
-    @java.lang.Override
+    @Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected Object newInstance(UnusedPrivateParameter unused) {
       return new PartitionedDml();
     }
 
-    @java.lang.Override
+    @Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -862,7 +828,7 @@ private PartitionedDml(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -894,23 +860,20 @@ private PartitionedDml(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.TransactionProto
+      return TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.TransactionProto
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.TransactionOptions.PartitionedDml.class,
-              com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder.class);
+          .ensureFieldAccessorsInitialized(PartitionedDml.class, Builder.class);
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -920,12 +883,12 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
+    @Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -936,22 +899,21 @@ public int getSerializedSize() {
       return size;
     }
 
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
+    @Override
+    public boolean equals(final Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof com.google.spanner.v1.TransactionOptions.PartitionedDml)) {
+      if (!(obj instanceof PartitionedDml)) {
         return super.equals(obj);
       }
-      com.google.spanner.v1.TransactionOptions.PartitionedDml other =
-          (com.google.spanner.v1.TransactionOptions.PartitionedDml) obj;
+      PartitionedDml other = (PartitionedDml) obj;
 
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -963,71 +925,69 @@ public int hashCode() {
       return hash;
     }
 
-    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static PartitionedDml parseFrom(java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
+    public static PartitionedDml parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
-        com.google.protobuf.ByteString data)
+    public static PartitionedDml parseFrom(com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
+    public static PartitionedDml 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.spanner.v1.TransactionOptions.PartitionedDml parseFrom(byte[] data)
+    public static PartitionedDml parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
+    public static PartitionedDml parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
+    public static PartitionedDml parseFrom(java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
+    public static PartitionedDml 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.spanner.v1.TransactionOptions.PartitionedDml parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
+    public static PartitionedDml parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseDelimitedFrom(
+    public static PartitionedDml 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.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    public static PartitionedDml parseFrom(com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
+    public static PartitionedDml parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1035,7 +995,7 @@ public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
+    @Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -1044,19 +1004,17 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(
-        com.google.spanner.v1.TransactionOptions.PartitionedDml prototype) {
+    public static Builder newBuilder(PartitionedDml prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @java.lang.Override
+    @Override
     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) {
+    @Override
+    protected Builder newBuilderForType(BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1073,20 +1031,17 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.TransactionOptions.PartitionedDml)
-        com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder {
+        PartitionedDmlOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return com.google.spanner.v1.TransactionProto
+        return TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_descriptor;
       }
 
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.spanner.v1.TransactionProto
+      @Override
+      protected FieldAccessorTable internalGetFieldAccessorTable() {
+        return TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.spanner.v1.TransactionOptions.PartitionedDml.class,
-                com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder.class);
+            .ensureFieldAccessorsInitialized(PartitionedDml.class, Builder.class);
       }
 
       // Construct using com.google.spanner.v1.TransactionOptions.PartitionedDml.newBuilder()
@@ -1094,7 +1049,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -1103,109 +1058,103 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @java.lang.Override
+      @Override
       public Builder clear() {
         super.clear();
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return com.google.spanner.v1.TransactionProto
+        return TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_descriptor;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.TransactionOptions.PartitionedDml getDefaultInstanceForType() {
-        return com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
+      @Override
+      public PartitionedDml getDefaultInstanceForType() {
+        return PartitionedDml.getDefaultInstance();
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.TransactionOptions.PartitionedDml build() {
-        com.google.spanner.v1.TransactionOptions.PartitionedDml result = buildPartial();
+      @Override
+      public PartitionedDml build() {
+        PartitionedDml result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.TransactionOptions.PartitionedDml buildPartial() {
-        com.google.spanner.v1.TransactionOptions.PartitionedDml result =
-            new com.google.spanner.v1.TransactionOptions.PartitionedDml(this);
+      @Override
+      public PartitionedDml buildPartial() {
+        PartitionedDml result = new PartitionedDml(this);
         onBuilt();
         return result;
       }
 
-      @java.lang.Override
+      @Override
       public Builder clone() {
         return super.clone();
       }
 
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      @Override
+      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.setField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @java.lang.Override
+      @Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.spanner.v1.TransactionOptions.PartitionedDml) {
-          return mergeFrom((com.google.spanner.v1.TransactionOptions.PartitionedDml) other);
+        if (other instanceof PartitionedDml) {
+          return mergeFrom((PartitionedDml) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.google.spanner.v1.TransactionOptions.PartitionedDml other) {
-        if (other == com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance())
-          return this;
+      public Builder mergeFrom(PartitionedDml other) {
+        if (other == PartitionedDml.getDefaultInstance()) return this;
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.spanner.v1.TransactionOptions.PartitionedDml parsedMessage = null;
+        PartitionedDml parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (com.google.spanner.v1.TransactionOptions.PartitionedDml) e.getUnfinishedMessage();
+          parsedMessage = (PartitionedDml) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1215,13 +1164,13 @@ public Builder mergeFrom(
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @java.lang.Override
+      @Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1231,19 +1180,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.TransactionOptions.PartitionedDml)
-    private static final com.google.spanner.v1.TransactionOptions.PartitionedDml DEFAULT_INSTANCE;
+    private static final PartitionedDml DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new com.google.spanner.v1.TransactionOptions.PartitionedDml();
+      DEFAULT_INSTANCE = new PartitionedDml();
     }
 
-    public static com.google.spanner.v1.TransactionOptions.PartitionedDml getDefaultInstance() {
+    public static PartitionedDml getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @java.lang.Override
+          @Override
           public PartitionedDml parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1256,13 +1205,13 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions.PartitionedDml getDefaultInstanceForType() {
+    @Override
+    public PartitionedDml getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
@@ -1552,8 +1501,7 @@ public interface ReadOnlyOrBuilder
      */
     boolean getReturnReadTimestamp();
 
-    public com.google.spanner.v1.TransactionOptions.ReadOnly.TimestampBoundCase
-        getTimestampBoundCase();
+    public ReadOnly.TimestampBoundCase getTimestampBoundCase();
   }
   /**
    *
@@ -1576,13 +1524,13 @@ private ReadOnly(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
     private ReadOnly() {}
 
-    @java.lang.Override
+    @Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected Object newInstance(UnusedPrivateParameter unused) {
       return new ReadOnly();
     }
 
-    @java.lang.Override
+    @Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -1593,7 +1541,7 @@ private ReadOnly(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException();
       }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1696,27 +1644,22 @@ private ReadOnly(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.TransactionProto
+      return TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_ReadOnly_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.TransactionProto
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_ReadOnly_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.TransactionOptions.ReadOnly.class,
-              com.google.spanner.v1.TransactionOptions.ReadOnly.Builder.class);
+          .ensureFieldAccessorsInitialized(ReadOnly.class, Builder.class);
     }
 
     private int timestampBoundCase_ = 0;
-    private java.lang.Object timestampBound_;
+    private Object timestampBound_;
 
     public enum TimestampBoundCase
-        implements
-            com.google.protobuf.Internal.EnumLite,
-            com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+        implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
       STRONG(1),
       MIN_READ_TIMESTAMP(2),
       MAX_STALENESS(3),
@@ -1733,7 +1676,7 @@ private TimestampBoundCase(int value) {
        * @return The enum associated with the given number.
        * @deprecated Use {@link #forNumber(int)} instead.
        */
-      @java.lang.Deprecated
+      @Deprecated
       public static TimestampBoundCase valueOf(int value) {
         return forNumber(value);
       }
@@ -1795,10 +1738,10 @@ public boolean hasStrong() {
      *
      * @return The strong.
      */
-    @java.lang.Override
+    @Override
     public boolean getStrong() {
       if (timestampBoundCase_ == 1) {
-        return (java.lang.Boolean) timestampBound_;
+        return (Boolean) timestampBound_;
       }
       return false;
     }
@@ -1821,7 +1764,7 @@ public boolean getStrong() {
      *
      * @return Whether the minReadTimestamp field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasMinReadTimestamp() {
       return timestampBoundCase_ == 2;
     }
@@ -1842,7 +1785,7 @@ public boolean hasMinReadTimestamp() {
      *
      * @return The minReadTimestamp.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Timestamp getMinReadTimestamp() {
       if (timestampBoundCase_ == 2) {
         return (com.google.protobuf.Timestamp) timestampBound_;
@@ -1864,7 +1807,7 @@ public com.google.protobuf.Timestamp getMinReadTimestamp() {
      *
      * .google.protobuf.Timestamp min_read_timestamp = 2;
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.TimestampOrBuilder getMinReadTimestampOrBuilder() {
       if (timestampBoundCase_ == 2) {
         return (com.google.protobuf.Timestamp) timestampBound_;
@@ -1894,7 +1837,7 @@ public com.google.protobuf.TimestampOrBuilder getMinReadTimestampOrBuilder() {
      *
      * @return Whether the maxStaleness field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasMaxStaleness() {
       return timestampBoundCase_ == 3;
     }
@@ -1919,7 +1862,7 @@ public boolean hasMaxStaleness() {
      *
      * @return The maxStaleness.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Duration getMaxStaleness() {
       if (timestampBoundCase_ == 3) {
         return (com.google.protobuf.Duration) timestampBound_;
@@ -1945,7 +1888,7 @@ public com.google.protobuf.Duration getMaxStaleness() {
      *
      * .google.protobuf.Duration max_staleness = 3;
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.DurationOrBuilder getMaxStalenessOrBuilder() {
       if (timestampBoundCase_ == 3) {
         return (com.google.protobuf.Duration) timestampBound_;
@@ -1974,7 +1917,7 @@ public com.google.protobuf.DurationOrBuilder getMaxStalenessOrBuilder() {
      *
      * @return Whether the readTimestamp field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasReadTimestamp() {
       return timestampBoundCase_ == 4;
     }
@@ -1998,7 +1941,7 @@ public boolean hasReadTimestamp() {
      *
      * @return The readTimestamp.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Timestamp getReadTimestamp() {
       if (timestampBoundCase_ == 4) {
         return (com.google.protobuf.Timestamp) timestampBound_;
@@ -2023,7 +1966,7 @@ public com.google.protobuf.Timestamp getReadTimestamp() {
      *
      * .google.protobuf.Timestamp read_timestamp = 4;
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
       if (timestampBoundCase_ == 4) {
         return (com.google.protobuf.Timestamp) timestampBound_;
@@ -2051,7 +1994,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
      *
      * @return Whether the exactStaleness field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasExactStaleness() {
       return timestampBoundCase_ == 5;
     }
@@ -2074,7 +2017,7 @@ public boolean hasExactStaleness() {
      *
      * @return The exactStaleness.
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Duration getExactStaleness() {
       if (timestampBoundCase_ == 5) {
         return (com.google.protobuf.Duration) timestampBound_;
@@ -2098,7 +2041,7 @@ public com.google.protobuf.Duration getExactStaleness() {
      *
      * .google.protobuf.Duration exact_staleness = 5;
      */
-    @java.lang.Override
+    @Override
     public com.google.protobuf.DurationOrBuilder getExactStalenessOrBuilder() {
       if (timestampBoundCase_ == 5) {
         return (com.google.protobuf.Duration) timestampBound_;
@@ -2120,14 +2063,14 @@ public com.google.protobuf.DurationOrBuilder getExactStalenessOrBuilder() {
      *
      * @return The returnReadTimestamp.
      */
-    @java.lang.Override
+    @Override
     public boolean getReturnReadTimestamp() {
       return returnReadTimestamp_;
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2137,10 +2080,10 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (timestampBoundCase_ == 1) {
-        output.writeBool(1, (boolean) ((java.lang.Boolean) timestampBound_));
+        output.writeBool(1, (boolean) ((Boolean) timestampBound_));
       }
       if (timestampBoundCase_ == 2) {
         output.writeMessage(2, (com.google.protobuf.Timestamp) timestampBound_);
@@ -2160,7 +2103,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
+    @Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2169,7 +2112,7 @@ public int getSerializedSize() {
       if (timestampBoundCase_ == 1) {
         size +=
             com.google.protobuf.CodedOutputStream.computeBoolSize(
-                1, (boolean) ((java.lang.Boolean) timestampBound_));
+                1, (boolean) ((Boolean) timestampBound_));
       }
       if (timestampBoundCase_ == 2) {
         size +=
@@ -2199,16 +2142,15 @@ public int getSerializedSize() {
       return size;
     }
 
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
+    @Override
+    public boolean equals(final Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof com.google.spanner.v1.TransactionOptions.ReadOnly)) {
+      if (!(obj instanceof ReadOnly)) {
         return super.equals(obj);
       }
-      com.google.spanner.v1.TransactionOptions.ReadOnly other =
-          (com.google.spanner.v1.TransactionOptions.ReadOnly) obj;
+      ReadOnly other = (ReadOnly) obj;
 
       if (getReturnReadTimestamp() != other.getReturnReadTimestamp()) return false;
       if (!getTimestampBoundCase().equals(other.getTimestampBoundCase())) return false;
@@ -2235,7 +2177,7 @@ public boolean equals(final java.lang.Object obj) {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -2273,71 +2215,69 @@ public int hashCode() {
       return hash;
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+    public static ReadOnly parseFrom(java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
+    public static ReadOnly parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
-        com.google.protobuf.ByteString data)
+    public static ReadOnly parseFrom(com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
+    public static ReadOnly 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.spanner.v1.TransactionOptions.ReadOnly parseFrom(byte[] data)
+    public static ReadOnly parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
+    public static ReadOnly parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
+    public static ReadOnly parseFrom(java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
+    public static ReadOnly 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.spanner.v1.TransactionOptions.ReadOnly parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
+    public static ReadOnly parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseDelimitedFrom(
+    public static ReadOnly 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.spanner.v1.TransactionOptions.ReadOnly parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    public static ReadOnly parseFrom(com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
+    public static ReadOnly parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2345,7 +2285,7 @@ public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
+    @Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -2354,18 +2294,17 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(com.google.spanner.v1.TransactionOptions.ReadOnly prototype) {
+    public static Builder newBuilder(ReadOnly prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @java.lang.Override
+    @Override
     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) {
+    @Override
+    protected Builder newBuilderForType(BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -2382,20 +2321,17 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.TransactionOptions.ReadOnly)
-        com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder {
+        ReadOnlyOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return com.google.spanner.v1.TransactionProto
+        return TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_ReadOnly_descriptor;
       }
 
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.spanner.v1.TransactionProto
+      @Override
+      protected FieldAccessorTable internalGetFieldAccessorTable() {
+        return TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_ReadOnly_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.spanner.v1.TransactionOptions.ReadOnly.class,
-                com.google.spanner.v1.TransactionOptions.ReadOnly.Builder.class);
+            .ensureFieldAccessorsInitialized(ReadOnly.class, Builder.class);
       }
 
       // Construct using com.google.spanner.v1.TransactionOptions.ReadOnly.newBuilder()
@@ -2403,7 +2339,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -2412,7 +2348,7 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @java.lang.Override
+      @Override
       public Builder clear() {
         super.clear();
         returnReadTimestamp_ = false;
@@ -2422,30 +2358,29 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return com.google.spanner.v1.TransactionProto
+        return TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_ReadOnly_descriptor;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() {
-        return com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
+      @Override
+      public ReadOnly getDefaultInstanceForType() {
+        return ReadOnly.getDefaultInstance();
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.TransactionOptions.ReadOnly build() {
-        com.google.spanner.v1.TransactionOptions.ReadOnly result = buildPartial();
+      @Override
+      public ReadOnly build() {
+        ReadOnly result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @java.lang.Override
-      public com.google.spanner.v1.TransactionOptions.ReadOnly buildPartial() {
-        com.google.spanner.v1.TransactionOptions.ReadOnly result =
-            new com.google.spanner.v1.TransactionOptions.ReadOnly(this);
+      @Override
+      public ReadOnly buildPartial() {
+        ReadOnly result = new ReadOnly(this);
         if (timestampBoundCase_ == 1) {
           result.timestampBound_ = timestampBound_;
         }
@@ -2483,54 +2418,50 @@ public com.google.spanner.v1.TransactionOptions.ReadOnly buildPartial() {
         return result;
       }
 
-      @java.lang.Override
+      @Override
       public Builder clone() {
         return super.clone();
       }
 
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      @Override
+      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.setField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @java.lang.Override
+      @Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @java.lang.Override
+      @Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.spanner.v1.TransactionOptions.ReadOnly) {
-          return mergeFrom((com.google.spanner.v1.TransactionOptions.ReadOnly) other);
+        if (other instanceof ReadOnly) {
+          return mergeFrom((ReadOnly) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.google.spanner.v1.TransactionOptions.ReadOnly other) {
-        if (other == com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance())
-          return this;
+      public Builder mergeFrom(ReadOnly other) {
+        if (other == ReadOnly.getDefaultInstance()) return this;
         if (other.getReturnReadTimestamp() != false) {
           setReturnReadTimestamp(other.getReturnReadTimestamp());
         }
@@ -2570,22 +2501,21 @@ public Builder mergeFrom(com.google.spanner.v1.TransactionOptions.ReadOnly other
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
+      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.google.spanner.v1.TransactionOptions.ReadOnly parsedMessage = null;
+        ReadOnly parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (com.google.spanner.v1.TransactionOptions.ReadOnly) e.getUnfinishedMessage();
+          parsedMessage = (ReadOnly) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2596,7 +2526,7 @@ public Builder mergeFrom(
       }
 
       private int timestampBoundCase_ = 0;
-      private java.lang.Object timestampBound_;
+      private Object timestampBound_;
 
       public TimestampBoundCase getTimestampBoundCase() {
         return TimestampBoundCase.forNumber(timestampBoundCase_);
@@ -2638,7 +2568,7 @@ public boolean hasStrong() {
        */
       public boolean getStrong() {
         if (timestampBoundCase_ == 1) {
-          return (java.lang.Boolean) timestampBound_;
+          return (Boolean) timestampBound_;
         }
         return false;
       }
@@ -2704,7 +2634,7 @@ public Builder clearStrong() {
        *
        * @return Whether the minReadTimestamp field is set.
        */
-      @java.lang.Override
+      @Override
       public boolean hasMinReadTimestamp() {
         return timestampBoundCase_ == 2;
       }
@@ -2725,7 +2655,7 @@ public boolean hasMinReadTimestamp() {
        *
        * @return The minReadTimestamp.
        */
-      @java.lang.Override
+      @Override
       public com.google.protobuf.Timestamp getMinReadTimestamp() {
         if (minReadTimestampBuilder_ == null) {
           if (timestampBoundCase_ == 2) {
@@ -2893,7 +2823,7 @@ public com.google.protobuf.Timestamp.Builder getMinReadTimestampBuilder() {
        *
        * .google.protobuf.Timestamp min_read_timestamp = 2;
        */
-      @java.lang.Override
+      @Override
       public com.google.protobuf.TimestampOrBuilder getMinReadTimestampOrBuilder() {
         if ((timestampBoundCase_ == 2) && (minReadTimestampBuilder_ != null)) {
           return minReadTimestampBuilder_.getMessageOrBuilder();
@@ -2970,7 +2900,7 @@ public com.google.protobuf.TimestampOrBuilder getMinReadTimestampOrBuilder() {
        *
        * @return Whether the maxStaleness field is set.
        */
-      @java.lang.Override
+      @Override
       public boolean hasMaxStaleness() {
         return timestampBoundCase_ == 3;
       }
@@ -2995,7 +2925,7 @@ public boolean hasMaxStaleness() {
        *
        * @return The maxStaleness.
        */
-      @java.lang.Override
+      @Override
       public com.google.protobuf.Duration getMaxStaleness() {
         if (maxStalenessBuilder_ == null) {
           if (timestampBoundCase_ == 3) {
@@ -3187,7 +3117,7 @@ public com.google.protobuf.Duration.Builder getMaxStalenessBuilder() {
        *
        * .google.protobuf.Duration max_staleness = 3;
        */
-      @java.lang.Override
+      @Override
       public com.google.protobuf.DurationOrBuilder getMaxStalenessOrBuilder() {
         if ((timestampBoundCase_ == 3) && (maxStalenessBuilder_ != null)) {
           return maxStalenessBuilder_.getMessageOrBuilder();
@@ -3267,7 +3197,7 @@ public com.google.protobuf.DurationOrBuilder getMaxStalenessOrBuilder() {
        *
        * @return Whether the readTimestamp field is set.
        */
-      @java.lang.Override
+      @Override
       public boolean hasReadTimestamp() {
         return timestampBoundCase_ == 4;
       }
@@ -3291,7 +3221,7 @@ public boolean hasReadTimestamp() {
        *
        * @return The readTimestamp.
        */
-      @java.lang.Override
+      @Override
       public com.google.protobuf.Timestamp getReadTimestamp() {
         if (readTimestampBuilder_ == null) {
           if (timestampBoundCase_ == 4) {
@@ -3477,7 +3407,7 @@ public com.google.protobuf.Timestamp.Builder getReadTimestampBuilder() {
        *
        * .google.protobuf.Timestamp read_timestamp = 4;
        */
-      @java.lang.Override
+      @Override
       public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
         if ((timestampBoundCase_ == 4) && (readTimestampBuilder_ != null)) {
           return readTimestampBuilder_.getMessageOrBuilder();
@@ -3555,7 +3485,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
        *
        * @return Whether the exactStaleness field is set.
        */
-      @java.lang.Override
+      @Override
       public boolean hasExactStaleness() {
         return timestampBoundCase_ == 5;
       }
@@ -3578,7 +3508,7 @@ public boolean hasExactStaleness() {
        *
        * @return The exactStaleness.
        */
-      @java.lang.Override
+      @Override
       public com.google.protobuf.Duration getExactStaleness() {
         if (exactStalenessBuilder_ == null) {
           if (timestampBoundCase_ == 5) {
@@ -3758,7 +3688,7 @@ public com.google.protobuf.Duration.Builder getExactStalenessBuilder() {
        *
        * .google.protobuf.Duration exact_staleness = 5;
        */
-      @java.lang.Override
+      @Override
       public com.google.protobuf.DurationOrBuilder getExactStalenessOrBuilder() {
         if ((timestampBoundCase_ == 5) && (exactStalenessBuilder_ != null)) {
           return exactStalenessBuilder_.getMessageOrBuilder();
@@ -3824,7 +3754,7 @@ public com.google.protobuf.DurationOrBuilder getExactStalenessOrBuilder() {
        *
        * @return The returnReadTimestamp.
        */
-      @java.lang.Override
+      @Override
       public boolean getReturnReadTimestamp() {
         return returnReadTimestamp_;
       }
@@ -3866,13 +3796,13 @@ public Builder clearReturnReadTimestamp() {
         return this;
       }
 
-      @java.lang.Override
+      @Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @java.lang.Override
+      @Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -3882,19 +3812,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.TransactionOptions.ReadOnly)
-    private static final com.google.spanner.v1.TransactionOptions.ReadOnly DEFAULT_INSTANCE;
+    private static final ReadOnly DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new com.google.spanner.v1.TransactionOptions.ReadOnly();
+      DEFAULT_INSTANCE = new ReadOnly();
     }
 
-    public static com.google.spanner.v1.TransactionOptions.ReadOnly getDefaultInstance() {
+    public static ReadOnly getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @java.lang.Override
+          @Override
           public ReadOnly parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3907,24 +3837,21 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() {
+    @Override
+    public ReadOnly getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
 
   private int modeCase_ = 0;
-  private java.lang.Object mode_;
+  private Object mode_;
 
-  public enum ModeCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
-          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+  public enum ModeCase implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
     READ_WRITE(1),
     PARTITIONED_DML(3),
     READ_ONLY(2),
@@ -3939,7 +3866,7 @@ private ModeCase(int value) {
      * @return The enum associated with the given number.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @java.lang.Deprecated
+    @Deprecated
     public static ModeCase valueOf(int value) {
       return forNumber(value);
     }
@@ -3983,7 +3910,7 @@ public ModeCase getModeCase() {
    *
    * @return Whether the readWrite field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasReadWrite() {
     return modeCase_ == 1;
   }
@@ -4001,12 +3928,12 @@ public boolean hasReadWrite() {
    *
    * @return The readWrite.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionOptions.ReadWrite getReadWrite() {
+  @Override
+  public ReadWrite getReadWrite() {
     if (modeCase_ == 1) {
-      return (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_;
+      return (ReadWrite) mode_;
     }
-    return com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
+    return ReadWrite.getDefaultInstance();
   }
   /**
    *
@@ -4020,12 +3947,12 @@ public com.google.spanner.v1.TransactionOptions.ReadWrite getReadWrite() {
    *
    * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder() {
+  @Override
+  public ReadWriteOrBuilder getReadWriteOrBuilder() {
     if (modeCase_ == 1) {
-      return (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_;
+      return (ReadWrite) mode_;
     }
-    return com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
+    return ReadWrite.getDefaultInstance();
   }
 
   public static final int PARTITIONED_DML_FIELD_NUMBER = 3;
@@ -4043,7 +3970,7 @@ public com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteO
    *
    * @return Whether the partitionedDml field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasPartitionedDml() {
     return modeCase_ == 3;
   }
@@ -4061,12 +3988,12 @@ public boolean hasPartitionedDml() {
    *
    * @return The partitionedDml.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionOptions.PartitionedDml getPartitionedDml() {
+  @Override
+  public PartitionedDml getPartitionedDml() {
     if (modeCase_ == 3) {
-      return (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_;
+      return (PartitionedDml) mode_;
     }
-    return com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
+    return PartitionedDml.getDefaultInstance();
   }
   /**
    *
@@ -4080,13 +4007,12 @@ public com.google.spanner.v1.TransactionOptions.PartitionedDml getPartitionedDml
    *
    * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder
-      getPartitionedDmlOrBuilder() {
+  @Override
+  public PartitionedDmlOrBuilder getPartitionedDmlOrBuilder() {
     if (modeCase_ == 3) {
-      return (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_;
+      return (PartitionedDml) mode_;
     }
-    return com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
+    return PartitionedDml.getDefaultInstance();
   }
 
   public static final int READ_ONLY_FIELD_NUMBER = 2;
@@ -4104,7 +4030,7 @@ public com.google.spanner.v1.TransactionOptions.PartitionedDml getPartitionedDml
    *
    * @return Whether the readOnly field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasReadOnly() {
     return modeCase_ == 2;
   }
@@ -4122,12 +4048,12 @@ public boolean hasReadOnly() {
    *
    * @return The readOnly.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionOptions.ReadOnly getReadOnly() {
+  @Override
+  public ReadOnly getReadOnly() {
     if (modeCase_ == 2) {
-      return (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_;
+      return (ReadOnly) mode_;
     }
-    return com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
+    return ReadOnly.getDefaultInstance();
   }
   /**
    *
@@ -4141,17 +4067,17 @@ public com.google.spanner.v1.TransactionOptions.ReadOnly getReadOnly() {
    *
    * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder() {
+  @Override
+  public ReadOnlyOrBuilder getReadOnlyOrBuilder() {
     if (modeCase_ == 2) {
-      return (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_;
+      return (ReadOnly) mode_;
     }
-    return com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
+    return ReadOnly.getDefaultInstance();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -4161,55 +4087,49 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (modeCase_ == 1) {
-      output.writeMessage(1, (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_);
+      output.writeMessage(1, (ReadWrite) mode_);
     }
     if (modeCase_ == 2) {
-      output.writeMessage(2, (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_);
+      output.writeMessage(2, (ReadOnly) mode_);
     }
     if (modeCase_ == 3) {
-      output.writeMessage(3, (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_);
+      output.writeMessage(3, (PartitionedDml) mode_);
     }
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
     if (modeCase_ == 1) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              1, (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_);
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, (ReadWrite) mode_);
     }
     if (modeCase_ == 2) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              2, (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_);
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, (ReadOnly) mode_);
     }
     if (modeCase_ == 3) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              3, (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_);
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, (PartitionedDml) mode_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.TransactionOptions)) {
+    if (!(obj instanceof TransactionOptions)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.TransactionOptions other = (com.google.spanner.v1.TransactionOptions) obj;
+    TransactionOptions other = (TransactionOptions) obj;
 
     if (!getModeCase().equals(other.getModeCase())) return false;
     switch (modeCase_) {
@@ -4229,7 +4149,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -4257,71 +4177,69 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.TransactionOptions parseFrom(java.nio.ByteBuffer data)
+  public static TransactionOptions parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.TransactionOptions parseFrom(
+  public static TransactionOptions parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.TransactionOptions parseFrom(
-      com.google.protobuf.ByteString data)
+  public static TransactionOptions parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.TransactionOptions parseFrom(
+  public static TransactionOptions 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.spanner.v1.TransactionOptions parseFrom(byte[] data)
+  public static TransactionOptions parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.TransactionOptions parseFrom(
+  public static TransactionOptions parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.TransactionOptions parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static TransactionOptions parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.TransactionOptions parseFrom(
+  public static TransactionOptions 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.spanner.v1.TransactionOptions parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
+  public static TransactionOptions parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.TransactionOptions parseDelimitedFrom(
+  public static TransactionOptions 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.spanner.v1.TransactionOptions parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static TransactionOptions parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.TransactionOptions parseFrom(
+  public static TransactionOptions parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -4329,7 +4247,7 @@ public static com.google.spanner.v1.TransactionOptions parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -4338,17 +4256,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.TransactionOptions prototype) {
+  public static Builder newBuilder(TransactionOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -4579,20 +4497,16 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.TransactionOptions)
-      com.google.spanner.v1.TransactionOptionsOrBuilder {
+      TransactionOptionsOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.TransactionProto
-          .internal_static_google_spanner_v1_TransactionOptions_descriptor;
+      return TransactionProto.internal_static_google_spanner_v1_TransactionOptions_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.TransactionProto
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.TransactionOptions.class,
-              com.google.spanner.v1.TransactionOptions.Builder.class);
+          .ensureFieldAccessorsInitialized(TransactionOptions.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.TransactionOptions.newBuilder()
@@ -4600,7 +4514,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -4609,7 +4523,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       modeCase_ = 0;
@@ -4617,30 +4531,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.TransactionProto
-          .internal_static_google_spanner_v1_TransactionOptions_descriptor;
+      return TransactionProto.internal_static_google_spanner_v1_TransactionOptions_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions getDefaultInstanceForType() {
-      return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+    @Override
+    public TransactionOptions getDefaultInstanceForType() {
+      return TransactionOptions.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions build() {
-      com.google.spanner.v1.TransactionOptions result = buildPartial();
+    @Override
+    public TransactionOptions build() {
+      TransactionOptions result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions buildPartial() {
-      com.google.spanner.v1.TransactionOptions result =
-          new com.google.spanner.v1.TransactionOptions(this);
+    @Override
+    public TransactionOptions buildPartial() {
+      TransactionOptions result = new TransactionOptions(this);
       if (modeCase_ == 1) {
         if (readWriteBuilder_ == null) {
           result.mode_ = mode_;
@@ -4667,51 +4579,50 @@ public com.google.spanner.v1.TransactionOptions buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.TransactionOptions) {
-        return mergeFrom((com.google.spanner.v1.TransactionOptions) other);
+      if (other instanceof TransactionOptions) {
+        return mergeFrom((TransactionOptions) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.TransactionOptions other) {
-      if (other == com.google.spanner.v1.TransactionOptions.getDefaultInstance()) return this;
+    public Builder mergeFrom(TransactionOptions other) {
+      if (other == TransactionOptions.getDefaultInstance()) return this;
       switch (other.getModeCase()) {
         case READ_WRITE:
           {
@@ -4738,21 +4649,21 @@ public Builder mergeFrom(com.google.spanner.v1.TransactionOptions other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.TransactionOptions parsedMessage = null;
+      TransactionOptions parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.TransactionOptions) e.getUnfinishedMessage();
+        parsedMessage = (TransactionOptions) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -4763,7 +4674,7 @@ public Builder mergeFrom(
     }
 
     private int modeCase_ = 0;
-    private java.lang.Object mode_;
+    private Object mode_;
 
     public ModeCase getModeCase() {
       return ModeCase.forNumber(modeCase_);
@@ -4777,9 +4688,7 @@ public Builder clearMode() {
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionOptions.ReadWrite,
-            com.google.spanner.v1.TransactionOptions.ReadWrite.Builder,
-            com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder>
+            ReadWrite, ReadWrite.Builder, ReadWriteOrBuilder>
         readWriteBuilder_;
     /**
      *
@@ -4795,7 +4704,7 @@ public Builder clearMode() {
      *
      * @return Whether the readWrite field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasReadWrite() {
       return modeCase_ == 1;
     }
@@ -4813,18 +4722,18 @@ public boolean hasReadWrite() {
      *
      * @return The readWrite.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions.ReadWrite getReadWrite() {
+    @Override
+    public ReadWrite getReadWrite() {
       if (readWriteBuilder_ == null) {
         if (modeCase_ == 1) {
-          return (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_;
+          return (ReadWrite) mode_;
         }
-        return com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
+        return ReadWrite.getDefaultInstance();
       } else {
         if (modeCase_ == 1) {
           return readWriteBuilder_.getMessage();
         }
-        return com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
+        return ReadWrite.getDefaultInstance();
       }
     }
     /**
@@ -4839,7 +4748,7 @@ public com.google.spanner.v1.TransactionOptions.ReadWrite getReadWrite() {
      *
      * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
      */
-    public Builder setReadWrite(com.google.spanner.v1.TransactionOptions.ReadWrite value) {
+    public Builder setReadWrite(ReadWrite value) {
       if (readWriteBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -4864,8 +4773,7 @@ public Builder setReadWrite(com.google.spanner.v1.TransactionOptions.ReadWrite v
      *
      * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
      */
-    public Builder setReadWrite(
-        com.google.spanner.v1.TransactionOptions.ReadWrite.Builder builderForValue) {
+    public Builder setReadWrite(ReadWrite.Builder builderForValue) {
       if (readWriteBuilder_ == null) {
         mode_ = builderForValue.build();
         onChanged();
@@ -4887,15 +4795,10 @@ public Builder setReadWrite(
      *
      * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
      */
-    public Builder mergeReadWrite(com.google.spanner.v1.TransactionOptions.ReadWrite value) {
+    public Builder mergeReadWrite(ReadWrite value) {
       if (readWriteBuilder_ == null) {
-        if (modeCase_ == 1
-            && mode_ != com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance()) {
-          mode_ =
-              com.google.spanner.v1.TransactionOptions.ReadWrite.newBuilder(
-                      (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (modeCase_ == 1 && mode_ != ReadWrite.getDefaultInstance()) {
+          mode_ = ReadWrite.newBuilder((ReadWrite) mode_).mergeFrom(value).buildPartial();
         } else {
           mode_ = value;
         }
@@ -4949,7 +4852,7 @@ public Builder clearReadWrite() {
      *
      * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
      */
-    public com.google.spanner.v1.TransactionOptions.ReadWrite.Builder getReadWriteBuilder() {
+    public ReadWrite.Builder getReadWriteBuilder() {
       return getReadWriteFieldBuilder().getBuilder();
     }
     /**
@@ -4964,15 +4867,15 @@ public com.google.spanner.v1.TransactionOptions.ReadWrite.Builder getReadWriteBu
      *
      * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder() {
+    @Override
+    public ReadWriteOrBuilder getReadWriteOrBuilder() {
       if ((modeCase_ == 1) && (readWriteBuilder_ != null)) {
         return readWriteBuilder_.getMessageOrBuilder();
       } else {
         if (modeCase_ == 1) {
-          return (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_;
+          return (ReadWrite) mode_;
         }
-        return com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
+        return ReadWrite.getDefaultInstance();
       }
     }
     /**
@@ -4988,22 +4891,16 @@ public com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteO
      * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionOptions.ReadWrite,
-            com.google.spanner.v1.TransactionOptions.ReadWrite.Builder,
-            com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder>
+            ReadWrite, ReadWrite.Builder, ReadWriteOrBuilder>
         getReadWriteFieldBuilder() {
       if (readWriteBuilder_ == null) {
         if (!(modeCase_ == 1)) {
-          mode_ = com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
+          mode_ = ReadWrite.getDefaultInstance();
         }
         readWriteBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.TransactionOptions.ReadWrite,
-                com.google.spanner.v1.TransactionOptions.ReadWrite.Builder,
-                com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder>(
-                (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_,
-                getParentForChildren(),
-                isClean());
+                ReadWrite, ReadWrite.Builder, ReadWriteOrBuilder>(
+                (ReadWrite) mode_, getParentForChildren(), isClean());
         mode_ = null;
       }
       modeCase_ = 1;
@@ -5013,9 +4910,7 @@ public com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteO
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionOptions.PartitionedDml,
-            com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder,
-            com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder>
+            PartitionedDml, PartitionedDml.Builder, PartitionedDmlOrBuilder>
         partitionedDmlBuilder_;
     /**
      *
@@ -5031,7 +4926,7 @@ public com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteO
      *
      * @return Whether the partitionedDml field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasPartitionedDml() {
       return modeCase_ == 3;
     }
@@ -5049,18 +4944,18 @@ public boolean hasPartitionedDml() {
      *
      * @return The partitionedDml.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions.PartitionedDml getPartitionedDml() {
+    @Override
+    public PartitionedDml getPartitionedDml() {
       if (partitionedDmlBuilder_ == null) {
         if (modeCase_ == 3) {
-          return (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_;
+          return (PartitionedDml) mode_;
         }
-        return com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
+        return PartitionedDml.getDefaultInstance();
       } else {
         if (modeCase_ == 3) {
           return partitionedDmlBuilder_.getMessage();
         }
-        return com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
+        return PartitionedDml.getDefaultInstance();
       }
     }
     /**
@@ -5075,8 +4970,7 @@ public com.google.spanner.v1.TransactionOptions.PartitionedDml getPartitionedDml
      *
      * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
      */
-    public Builder setPartitionedDml(
-        com.google.spanner.v1.TransactionOptions.PartitionedDml value) {
+    public Builder setPartitionedDml(PartitionedDml value) {
       if (partitionedDmlBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -5101,8 +4995,7 @@ public Builder setPartitionedDml(
      *
      * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
      */
-    public Builder setPartitionedDml(
-        com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder builderForValue) {
+    public Builder setPartitionedDml(PartitionedDml.Builder builderForValue) {
       if (partitionedDmlBuilder_ == null) {
         mode_ = builderForValue.build();
         onChanged();
@@ -5124,17 +5017,10 @@ public Builder setPartitionedDml(
      *
      * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
      */
-    public Builder mergePartitionedDml(
-        com.google.spanner.v1.TransactionOptions.PartitionedDml value) {
+    public Builder mergePartitionedDml(PartitionedDml value) {
       if (partitionedDmlBuilder_ == null) {
-        if (modeCase_ == 3
-            && mode_
-                != com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance()) {
-          mode_ =
-              com.google.spanner.v1.TransactionOptions.PartitionedDml.newBuilder(
-                      (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (modeCase_ == 3 && mode_ != PartitionedDml.getDefaultInstance()) {
+          mode_ = PartitionedDml.newBuilder((PartitionedDml) mode_).mergeFrom(value).buildPartial();
         } else {
           mode_ = value;
         }
@@ -5188,8 +5074,7 @@ public Builder clearPartitionedDml() {
      *
      * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
      */
-    public com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder
-        getPartitionedDmlBuilder() {
+    public PartitionedDml.Builder getPartitionedDmlBuilder() {
       return getPartitionedDmlFieldBuilder().getBuilder();
     }
     /**
@@ -5204,16 +5089,15 @@ public Builder clearPartitionedDml() {
      *
      * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder
-        getPartitionedDmlOrBuilder() {
+    @Override
+    public PartitionedDmlOrBuilder getPartitionedDmlOrBuilder() {
       if ((modeCase_ == 3) && (partitionedDmlBuilder_ != null)) {
         return partitionedDmlBuilder_.getMessageOrBuilder();
       } else {
         if (modeCase_ == 3) {
-          return (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_;
+          return (PartitionedDml) mode_;
         }
-        return com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
+        return PartitionedDml.getDefaultInstance();
       }
     }
     /**
@@ -5229,22 +5113,16 @@ public Builder clearPartitionedDml() {
      * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionOptions.PartitionedDml,
-            com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder,
-            com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder>
+            PartitionedDml, PartitionedDml.Builder, PartitionedDmlOrBuilder>
         getPartitionedDmlFieldBuilder() {
       if (partitionedDmlBuilder_ == null) {
         if (!(modeCase_ == 3)) {
-          mode_ = com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
+          mode_ = PartitionedDml.getDefaultInstance();
         }
         partitionedDmlBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.TransactionOptions.PartitionedDml,
-                com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder,
-                com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder>(
-                (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_,
-                getParentForChildren(),
-                isClean());
+                PartitionedDml, PartitionedDml.Builder, PartitionedDmlOrBuilder>(
+                (PartitionedDml) mode_, getParentForChildren(), isClean());
         mode_ = null;
       }
       modeCase_ = 3;
@@ -5253,10 +5131,7 @@ public Builder clearPartitionedDml() {
       return partitionedDmlBuilder_;
     }
 
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionOptions.ReadOnly,
-            com.google.spanner.v1.TransactionOptions.ReadOnly.Builder,
-            com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         readOnlyBuilder_;
     /**
      *
@@ -5272,7 +5147,7 @@ public Builder clearPartitionedDml() {
      *
      * @return Whether the readOnly field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasReadOnly() {
       return modeCase_ == 2;
     }
@@ -5290,18 +5165,18 @@ public boolean hasReadOnly() {
      *
      * @return The readOnly.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions.ReadOnly getReadOnly() {
+    @Override
+    public ReadOnly getReadOnly() {
       if (readOnlyBuilder_ == null) {
         if (modeCase_ == 2) {
-          return (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_;
+          return (ReadOnly) mode_;
         }
-        return com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
+        return ReadOnly.getDefaultInstance();
       } else {
         if (modeCase_ == 2) {
           return readOnlyBuilder_.getMessage();
         }
-        return com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
+        return ReadOnly.getDefaultInstance();
       }
     }
     /**
@@ -5316,7 +5191,7 @@ public com.google.spanner.v1.TransactionOptions.ReadOnly getReadOnly() {
      *
      * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
      */
-    public Builder setReadOnly(com.google.spanner.v1.TransactionOptions.ReadOnly value) {
+    public Builder setReadOnly(ReadOnly value) {
       if (readOnlyBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -5341,8 +5216,7 @@ public Builder setReadOnly(com.google.spanner.v1.TransactionOptions.ReadOnly val
      *
      * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
      */
-    public Builder setReadOnly(
-        com.google.spanner.v1.TransactionOptions.ReadOnly.Builder builderForValue) {
+    public Builder setReadOnly(ReadOnly.Builder builderForValue) {
       if (readOnlyBuilder_ == null) {
         mode_ = builderForValue.build();
         onChanged();
@@ -5364,15 +5238,10 @@ public Builder setReadOnly(
      *
      * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
      */
-    public Builder mergeReadOnly(com.google.spanner.v1.TransactionOptions.ReadOnly value) {
+    public Builder mergeReadOnly(ReadOnly value) {
       if (readOnlyBuilder_ == null) {
-        if (modeCase_ == 2
-            && mode_ != com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance()) {
-          mode_ =
-              com.google.spanner.v1.TransactionOptions.ReadOnly.newBuilder(
-                      (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (modeCase_ == 2 && mode_ != ReadOnly.getDefaultInstance()) {
+          mode_ = ReadOnly.newBuilder((ReadOnly) mode_).mergeFrom(value).buildPartial();
         } else {
           mode_ = value;
         }
@@ -5426,7 +5295,7 @@ public Builder clearReadOnly() {
      *
      * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
      */
-    public com.google.spanner.v1.TransactionOptions.ReadOnly.Builder getReadOnlyBuilder() {
+    public ReadOnly.Builder getReadOnlyBuilder() {
       return getReadOnlyFieldBuilder().getBuilder();
     }
     /**
@@ -5441,15 +5310,15 @@ public com.google.spanner.v1.TransactionOptions.ReadOnly.Builder getReadOnlyBuil
      *
      * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder() {
+    @Override
+    public ReadOnlyOrBuilder getReadOnlyOrBuilder() {
       if ((modeCase_ == 2) && (readOnlyBuilder_ != null)) {
         return readOnlyBuilder_.getMessageOrBuilder();
       } else {
         if (modeCase_ == 2) {
-          return (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_;
+          return (ReadOnly) mode_;
         }
-        return com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
+        return ReadOnly.getDefaultInstance();
       }
     }
     /**
@@ -5464,23 +5333,16 @@ public com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrB
      *
      * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
      */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionOptions.ReadOnly,
-            com.google.spanner.v1.TransactionOptions.ReadOnly.Builder,
-            com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         getReadOnlyFieldBuilder() {
       if (readOnlyBuilder_ == null) {
         if (!(modeCase_ == 2)) {
-          mode_ = com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
+          mode_ = ReadOnly.getDefaultInstance();
         }
         readOnlyBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.TransactionOptions.ReadOnly,
-                com.google.spanner.v1.TransactionOptions.ReadOnly.Builder,
-                com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder>(
-                (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_,
-                getParentForChildren(),
-                isClean());
+                ReadOnly, ReadOnly.Builder, ReadOnlyOrBuilder>(
+                (ReadOnly) mode_, getParentForChildren(), isClean());
         mode_ = null;
       }
       modeCase_ = 2;
@@ -5489,12 +5351,12 @@ public com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrB
       return readOnlyBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -5504,19 +5366,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.TransactionOptions)
-  private static final com.google.spanner.v1.TransactionOptions DEFAULT_INSTANCE;
+  private static final TransactionOptions DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.TransactionOptions();
+    DEFAULT_INSTANCE = new TransactionOptions();
   }
 
-  public static com.google.spanner.v1.TransactionOptions getDefaultInstance() {
+  public static TransactionOptions getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public TransactionOptions parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5529,13 +5391,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionOptions getDefaultInstanceForType() {
+  @Override
+  public TransactionOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptionsOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptionsOrBuilder.java
index c7b46083a1..238bfe22e6 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptionsOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptionsOrBuilder.java
@@ -52,7 +52,7 @@ public interface TransactionOptionsOrBuilder
    *
    * @return The readWrite.
    */
-  com.google.spanner.v1.TransactionOptions.ReadWrite getReadWrite();
+  TransactionOptions.ReadWrite getReadWrite();
   /**
    *
    *
@@ -65,7 +65,7 @@ public interface TransactionOptionsOrBuilder
    *
    * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
    */
-  com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder();
+  TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder();
 
   /**
    *
@@ -96,7 +96,7 @@ public interface TransactionOptionsOrBuilder
    *
    * @return The partitionedDml.
    */
-  com.google.spanner.v1.TransactionOptions.PartitionedDml getPartitionedDml();
+  TransactionOptions.PartitionedDml getPartitionedDml();
   /**
    *
    *
@@ -109,7 +109,7 @@ public interface TransactionOptionsOrBuilder
    *
    * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
    */
-  com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder getPartitionedDmlOrBuilder();
+  TransactionOptions.PartitionedDmlOrBuilder getPartitionedDmlOrBuilder();
 
   /**
    *
@@ -140,7 +140,7 @@ public interface TransactionOptionsOrBuilder
    *
    * @return The readOnly.
    */
-  com.google.spanner.v1.TransactionOptions.ReadOnly getReadOnly();
+  TransactionOptions.ReadOnly getReadOnly();
   /**
    *
    *
@@ -153,7 +153,7 @@ public interface TransactionOptionsOrBuilder
    *
    * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
    */
-  com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder();
+  TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder();
 
-  public com.google.spanner.v1.TransactionOptions.ModeCase getModeCase();
+  public TransactionOptions.ModeCase getModeCase();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java
index b3330eeacb..430b0482ae 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java
@@ -59,7 +59,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
   static {
-    java.lang.String[] descriptorData = {
+    String[] descriptorData = {
       "\n#google/spanner/v1/transaction.proto\022\021g"
           + "oogle.spanner.v1\032\036google/protobuf/durati"
           + "on.proto\032\037google/protobuf/timestamp.prot"
@@ -104,7 +104,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_TransactionOptions_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_TransactionOptions_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "ReadWrite", "PartitionedDml", "ReadOnly", "Mode",
             });
     internal_static_google_spanner_v1_TransactionOptions_ReadWrite_descriptor =
@@ -112,19 +112,19 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_TransactionOptions_ReadWrite_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_TransactionOptions_ReadWrite_descriptor,
-            new java.lang.String[] {});
+            new String[] {});
     internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_descriptor =
         internal_static_google_spanner_v1_TransactionOptions_descriptor.getNestedTypes().get(1);
     internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_descriptor,
-            new java.lang.String[] {});
+            new String[] {});
     internal_static_google_spanner_v1_TransactionOptions_ReadOnly_descriptor =
         internal_static_google_spanner_v1_TransactionOptions_descriptor.getNestedTypes().get(2);
     internal_static_google_spanner_v1_TransactionOptions_ReadOnly_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_TransactionOptions_ReadOnly_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Strong",
               "MinReadTimestamp",
               "MaxStaleness",
@@ -138,7 +138,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_Transaction_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_Transaction_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Id", "ReadTimestamp",
             });
     internal_static_google_spanner_v1_TransactionSelector_descriptor =
@@ -146,7 +146,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_TransactionSelector_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_TransactionSelector_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "SingleUse", "Id", "Begin", "Selector",
             });
     com.google.protobuf.DurationProto.getDescriptor();
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java
index 0ea44276aa..7f884d5528 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java
@@ -42,13 +42,13 @@ private TransactionSelector(com.google.protobuf.GeneratedMessageV3.Builder bu
 
   private TransactionSelector() {}
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new TransactionSelector();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private TransactionSelector(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -73,15 +73,13 @@ private TransactionSelector(
             break;
           case 10:
             {
-              com.google.spanner.v1.TransactionOptions.Builder subBuilder = null;
+              TransactionOptions.Builder subBuilder = null;
               if (selectorCase_ == 1) {
-                subBuilder = ((com.google.spanner.v1.TransactionOptions) selector_).toBuilder();
+                subBuilder = ((TransactionOptions) selector_).toBuilder();
               }
-              selector_ =
-                  input.readMessage(
-                      com.google.spanner.v1.TransactionOptions.parser(), extensionRegistry);
+              selector_ = input.readMessage(TransactionOptions.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.spanner.v1.TransactionOptions) selector_);
+                subBuilder.mergeFrom((TransactionOptions) selector_);
                 selector_ = subBuilder.buildPartial();
               }
               selectorCase_ = 1;
@@ -95,15 +93,13 @@ private TransactionSelector(
             }
           case 26:
             {
-              com.google.spanner.v1.TransactionOptions.Builder subBuilder = null;
+              TransactionOptions.Builder subBuilder = null;
               if (selectorCase_ == 3) {
-                subBuilder = ((com.google.spanner.v1.TransactionOptions) selector_).toBuilder();
+                subBuilder = ((TransactionOptions) selector_).toBuilder();
               }
-              selector_ =
-                  input.readMessage(
-                      com.google.spanner.v1.TransactionOptions.parser(), extensionRegistry);
+              selector_ = input.readMessage(TransactionOptions.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.spanner.v1.TransactionOptions) selector_);
+                subBuilder.mergeFrom((TransactionOptions) selector_);
                 selector_ = subBuilder.buildPartial();
               }
               selectorCase_ = 3;
@@ -129,27 +125,19 @@ private TransactionSelector(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.TransactionProto
-        .internal_static_google_spanner_v1_TransactionSelector_descriptor;
+    return TransactionProto.internal_static_google_spanner_v1_TransactionSelector_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.TransactionProto
-        .internal_static_google_spanner_v1_TransactionSelector_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.TransactionSelector.class,
-            com.google.spanner.v1.TransactionSelector.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return TransactionProto.internal_static_google_spanner_v1_TransactionSelector_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(TransactionSelector.class, Builder.class);
   }
 
   private int selectorCase_ = 0;
-  private java.lang.Object selector_;
+  private Object selector_;
 
-  public enum SelectorCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
-          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+  public enum SelectorCase implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
     SINGLE_USE(1),
     ID(2),
     BEGIN(3),
@@ -164,7 +152,7 @@ private SelectorCase(int value) {
      * @return The enum associated with the given number.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @java.lang.Deprecated
+    @Deprecated
     public static SelectorCase valueOf(int value) {
       return forNumber(value);
     }
@@ -207,7 +195,7 @@ public SelectorCase getSelectorCase() {
    *
    * @return Whether the singleUse field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasSingleUse() {
     return selectorCase_ == 1;
   }
@@ -224,12 +212,12 @@ public boolean hasSingleUse() {
    *
    * @return The singleUse.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionOptions getSingleUse() {
+  @Override
+  public TransactionOptions getSingleUse() {
     if (selectorCase_ == 1) {
-      return (com.google.spanner.v1.TransactionOptions) selector_;
+      return (TransactionOptions) selector_;
     }
-    return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+    return TransactionOptions.getDefaultInstance();
   }
   /**
    *
@@ -242,12 +230,12 @@ public com.google.spanner.v1.TransactionOptions getSingleUse() {
    *
    * .google.spanner.v1.TransactionOptions single_use = 1;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionOptionsOrBuilder getSingleUseOrBuilder() {
+  @Override
+  public TransactionOptionsOrBuilder getSingleUseOrBuilder() {
     if (selectorCase_ == 1) {
-      return (com.google.spanner.v1.TransactionOptions) selector_;
+      return (TransactionOptions) selector_;
     }
-    return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+    return TransactionOptions.getDefaultInstance();
   }
 
   public static final int ID_FIELD_NUMBER = 2;
@@ -277,7 +265,7 @@ public boolean hasId() {
    *
    * @return The id.
    */
-  @java.lang.Override
+  @Override
   public com.google.protobuf.ByteString getId() {
     if (selectorCase_ == 2) {
       return (com.google.protobuf.ByteString) selector_;
@@ -299,7 +287,7 @@ public com.google.protobuf.ByteString getId() {
    *
    * @return Whether the begin field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasBegin() {
     return selectorCase_ == 3;
   }
@@ -316,12 +304,12 @@ public boolean hasBegin() {
    *
    * @return The begin.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionOptions getBegin() {
+  @Override
+  public TransactionOptions getBegin() {
     if (selectorCase_ == 3) {
-      return (com.google.spanner.v1.TransactionOptions) selector_;
+      return (TransactionOptions) selector_;
     }
-    return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+    return TransactionOptions.getDefaultInstance();
   }
   /**
    *
@@ -334,17 +322,17 @@ public com.google.spanner.v1.TransactionOptions getBegin() {
    *
    * .google.spanner.v1.TransactionOptions begin = 3;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionOptionsOrBuilder getBeginOrBuilder() {
+  @Override
+  public TransactionOptionsOrBuilder getBeginOrBuilder() {
     if (selectorCase_ == 3) {
-      return (com.google.spanner.v1.TransactionOptions) selector_;
+      return (TransactionOptions) selector_;
     }
-    return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+    return TransactionOptions.getDefaultInstance();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -354,21 +342,21 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (selectorCase_ == 1) {
-      output.writeMessage(1, (com.google.spanner.v1.TransactionOptions) selector_);
+      output.writeMessage(1, (TransactionOptions) selector_);
     }
     if (selectorCase_ == 2) {
       output.writeBytes(2, (com.google.protobuf.ByteString) selector_);
     }
     if (selectorCase_ == 3) {
-      output.writeMessage(3, (com.google.spanner.v1.TransactionOptions) selector_);
+      output.writeMessage(3, (TransactionOptions) selector_);
     }
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -377,7 +365,7 @@ public int getSerializedSize() {
     if (selectorCase_ == 1) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(
-              1, (com.google.spanner.v1.TransactionOptions) selector_);
+              1, (TransactionOptions) selector_);
     }
     if (selectorCase_ == 2) {
       size +=
@@ -387,23 +375,22 @@ public int getSerializedSize() {
     if (selectorCase_ == 3) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(
-              3, (com.google.spanner.v1.TransactionOptions) selector_);
+              3, (TransactionOptions) selector_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.TransactionSelector)) {
+    if (!(obj instanceof TransactionSelector)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.TransactionSelector other =
-        (com.google.spanner.v1.TransactionSelector) obj;
+    TransactionSelector other = (TransactionSelector) obj;
 
     if (!getSelectorCase().equals(other.getSelectorCase())) return false;
     switch (selectorCase_) {
@@ -423,7 +410,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -451,71 +438,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.TransactionSelector parseFrom(java.nio.ByteBuffer data)
+  public static TransactionSelector parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.TransactionSelector parseFrom(
+  public static TransactionSelector parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.TransactionSelector parseFrom(
-      com.google.protobuf.ByteString data)
+  public static TransactionSelector parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.TransactionSelector parseFrom(
+  public static TransactionSelector 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.spanner.v1.TransactionSelector parseFrom(byte[] data)
+  public static TransactionSelector parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.TransactionSelector parseFrom(
+  public static TransactionSelector parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.TransactionSelector parseFrom(java.io.InputStream input)
+  public static TransactionSelector parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.TransactionSelector parseFrom(
+  public static TransactionSelector 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.spanner.v1.TransactionSelector parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
+  public static TransactionSelector parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.TransactionSelector parseDelimitedFrom(
+  public static TransactionSelector 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.spanner.v1.TransactionSelector parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+  public static TransactionSelector parseFrom(com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.TransactionSelector parseFrom(
+  public static TransactionSelector parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -523,7 +509,7 @@ public static com.google.spanner.v1.TransactionSelector parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -532,17 +518,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.TransactionSelector prototype) {
+  public static Builder newBuilder(TransactionSelector prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -561,20 +547,16 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.TransactionSelector)
-      com.google.spanner.v1.TransactionSelectorOrBuilder {
+      TransactionSelectorOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.TransactionProto
-          .internal_static_google_spanner_v1_TransactionSelector_descriptor;
+      return TransactionProto.internal_static_google_spanner_v1_TransactionSelector_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.TransactionProto
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return TransactionProto
           .internal_static_google_spanner_v1_TransactionSelector_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.TransactionSelector.class,
-              com.google.spanner.v1.TransactionSelector.Builder.class);
+          .ensureFieldAccessorsInitialized(TransactionSelector.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.TransactionSelector.newBuilder()
@@ -582,7 +564,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -591,7 +573,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       selectorCase_ = 0;
@@ -599,30 +581,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.TransactionProto
-          .internal_static_google_spanner_v1_TransactionSelector_descriptor;
+      return TransactionProto.internal_static_google_spanner_v1_TransactionSelector_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionSelector getDefaultInstanceForType() {
-      return com.google.spanner.v1.TransactionSelector.getDefaultInstance();
+    @Override
+    public TransactionSelector getDefaultInstanceForType() {
+      return TransactionSelector.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionSelector build() {
-      com.google.spanner.v1.TransactionSelector result = buildPartial();
+    @Override
+    public TransactionSelector build() {
+      TransactionSelector result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionSelector buildPartial() {
-      com.google.spanner.v1.TransactionSelector result =
-          new com.google.spanner.v1.TransactionSelector(this);
+    @Override
+    public TransactionSelector buildPartial() {
+      TransactionSelector result = new TransactionSelector(this);
       if (selectorCase_ == 1) {
         if (singleUseBuilder_ == null) {
           result.selector_ = selector_;
@@ -645,51 +625,50 @@ public com.google.spanner.v1.TransactionSelector buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.TransactionSelector) {
-        return mergeFrom((com.google.spanner.v1.TransactionSelector) other);
+      if (other instanceof TransactionSelector) {
+        return mergeFrom((TransactionSelector) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.TransactionSelector other) {
-      if (other == com.google.spanner.v1.TransactionSelector.getDefaultInstance()) return this;
+    public Builder mergeFrom(TransactionSelector other) {
+      if (other == TransactionSelector.getDefaultInstance()) return this;
       switch (other.getSelectorCase()) {
         case SINGLE_USE:
           {
@@ -716,21 +695,21 @@ public Builder mergeFrom(com.google.spanner.v1.TransactionSelector other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.TransactionSelector parsedMessage = null;
+      TransactionSelector parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.TransactionSelector) e.getUnfinishedMessage();
+        parsedMessage = (TransactionSelector) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -741,7 +720,7 @@ public Builder mergeFrom(
     }
 
     private int selectorCase_ = 0;
-    private java.lang.Object selector_;
+    private Object selector_;
 
     public SelectorCase getSelectorCase() {
       return SelectorCase.forNumber(selectorCase_);
@@ -755,9 +734,7 @@ public Builder clearSelector() {
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionOptions,
-            com.google.spanner.v1.TransactionOptions.Builder,
-            com.google.spanner.v1.TransactionOptionsOrBuilder>
+            TransactionOptions, TransactionOptions.Builder, TransactionOptionsOrBuilder>
         singleUseBuilder_;
     /**
      *
@@ -772,7 +749,7 @@ public Builder clearSelector() {
      *
      * @return Whether the singleUse field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasSingleUse() {
       return selectorCase_ == 1;
     }
@@ -789,18 +766,18 @@ public boolean hasSingleUse() {
      *
      * @return The singleUse.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions getSingleUse() {
+    @Override
+    public TransactionOptions getSingleUse() {
       if (singleUseBuilder_ == null) {
         if (selectorCase_ == 1) {
-          return (com.google.spanner.v1.TransactionOptions) selector_;
+          return (TransactionOptions) selector_;
         }
-        return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+        return TransactionOptions.getDefaultInstance();
       } else {
         if (selectorCase_ == 1) {
           return singleUseBuilder_.getMessage();
         }
-        return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+        return TransactionOptions.getDefaultInstance();
       }
     }
     /**
@@ -814,7 +791,7 @@ public com.google.spanner.v1.TransactionOptions getSingleUse() {
      *
      * .google.spanner.v1.TransactionOptions single_use = 1;
      */
-    public Builder setSingleUse(com.google.spanner.v1.TransactionOptions value) {
+    public Builder setSingleUse(TransactionOptions value) {
       if (singleUseBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -838,7 +815,7 @@ public Builder setSingleUse(com.google.spanner.v1.TransactionOptions value) {
      *
      * .google.spanner.v1.TransactionOptions single_use = 1;
      */
-    public Builder setSingleUse(com.google.spanner.v1.TransactionOptions.Builder builderForValue) {
+    public Builder setSingleUse(TransactionOptions.Builder builderForValue) {
       if (singleUseBuilder_ == null) {
         selector_ = builderForValue.build();
         onChanged();
@@ -859,13 +836,11 @@ public Builder setSingleUse(com.google.spanner.v1.TransactionOptions.Builder bui
      *
      * .google.spanner.v1.TransactionOptions single_use = 1;
      */
-    public Builder mergeSingleUse(com.google.spanner.v1.TransactionOptions value) {
+    public Builder mergeSingleUse(TransactionOptions value) {
       if (singleUseBuilder_ == null) {
-        if (selectorCase_ == 1
-            && selector_ != com.google.spanner.v1.TransactionOptions.getDefaultInstance()) {
+        if (selectorCase_ == 1 && selector_ != TransactionOptions.getDefaultInstance()) {
           selector_ =
-              com.google.spanner.v1.TransactionOptions.newBuilder(
-                      (com.google.spanner.v1.TransactionOptions) selector_)
+              TransactionOptions.newBuilder((TransactionOptions) selector_)
                   .mergeFrom(value)
                   .buildPartial();
         } else {
@@ -919,7 +894,7 @@ public Builder clearSingleUse() {
      *
      * .google.spanner.v1.TransactionOptions single_use = 1;
      */
-    public com.google.spanner.v1.TransactionOptions.Builder getSingleUseBuilder() {
+    public TransactionOptions.Builder getSingleUseBuilder() {
       return getSingleUseFieldBuilder().getBuilder();
     }
     /**
@@ -933,15 +908,15 @@ public com.google.spanner.v1.TransactionOptions.Builder getSingleUseBuilder() {
      *
      * .google.spanner.v1.TransactionOptions single_use = 1;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptionsOrBuilder getSingleUseOrBuilder() {
+    @Override
+    public TransactionOptionsOrBuilder getSingleUseOrBuilder() {
       if ((selectorCase_ == 1) && (singleUseBuilder_ != null)) {
         return singleUseBuilder_.getMessageOrBuilder();
       } else {
         if (selectorCase_ == 1) {
-          return (com.google.spanner.v1.TransactionOptions) selector_;
+          return (TransactionOptions) selector_;
         }
-        return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+        return TransactionOptions.getDefaultInstance();
       }
     }
     /**
@@ -956,22 +931,16 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getSingleUseOrBuilder()
      * .google.spanner.v1.TransactionOptions single_use = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionOptions,
-            com.google.spanner.v1.TransactionOptions.Builder,
-            com.google.spanner.v1.TransactionOptionsOrBuilder>
+            TransactionOptions, TransactionOptions.Builder, TransactionOptionsOrBuilder>
         getSingleUseFieldBuilder() {
       if (singleUseBuilder_ == null) {
         if (!(selectorCase_ == 1)) {
-          selector_ = com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+          selector_ = TransactionOptions.getDefaultInstance();
         }
         singleUseBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.TransactionOptions,
-                com.google.spanner.v1.TransactionOptions.Builder,
-                com.google.spanner.v1.TransactionOptionsOrBuilder>(
-                (com.google.spanner.v1.TransactionOptions) selector_,
-                getParentForChildren(),
-                isClean());
+                TransactionOptions, TransactionOptions.Builder, TransactionOptionsOrBuilder>(
+                (TransactionOptions) selector_, getParentForChildren(), isClean());
         selector_ = null;
       }
       selectorCase_ = 1;
@@ -1053,9 +1022,7 @@ public Builder clearId() {
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionOptions,
-            com.google.spanner.v1.TransactionOptions.Builder,
-            com.google.spanner.v1.TransactionOptionsOrBuilder>
+            TransactionOptions, TransactionOptions.Builder, TransactionOptionsOrBuilder>
         beginBuilder_;
     /**
      *
@@ -1070,7 +1037,7 @@ public Builder clearId() {
      *
      * @return Whether the begin field is set.
      */
-    @java.lang.Override
+    @Override
     public boolean hasBegin() {
       return selectorCase_ == 3;
     }
@@ -1087,18 +1054,18 @@ public boolean hasBegin() {
      *
      * @return The begin.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptions getBegin() {
+    @Override
+    public TransactionOptions getBegin() {
       if (beginBuilder_ == null) {
         if (selectorCase_ == 3) {
-          return (com.google.spanner.v1.TransactionOptions) selector_;
+          return (TransactionOptions) selector_;
         }
-        return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+        return TransactionOptions.getDefaultInstance();
       } else {
         if (selectorCase_ == 3) {
           return beginBuilder_.getMessage();
         }
-        return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+        return TransactionOptions.getDefaultInstance();
       }
     }
     /**
@@ -1112,7 +1079,7 @@ public com.google.spanner.v1.TransactionOptions getBegin() {
      *
      * .google.spanner.v1.TransactionOptions begin = 3;
      */
-    public Builder setBegin(com.google.spanner.v1.TransactionOptions value) {
+    public Builder setBegin(TransactionOptions value) {
       if (beginBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1136,7 +1103,7 @@ public Builder setBegin(com.google.spanner.v1.TransactionOptions value) {
      *
      * .google.spanner.v1.TransactionOptions begin = 3;
      */
-    public Builder setBegin(com.google.spanner.v1.TransactionOptions.Builder builderForValue) {
+    public Builder setBegin(TransactionOptions.Builder builderForValue) {
       if (beginBuilder_ == null) {
         selector_ = builderForValue.build();
         onChanged();
@@ -1157,13 +1124,11 @@ public Builder setBegin(com.google.spanner.v1.TransactionOptions.Builder builder
      *
      * .google.spanner.v1.TransactionOptions begin = 3;
      */
-    public Builder mergeBegin(com.google.spanner.v1.TransactionOptions value) {
+    public Builder mergeBegin(TransactionOptions value) {
       if (beginBuilder_ == null) {
-        if (selectorCase_ == 3
-            && selector_ != com.google.spanner.v1.TransactionOptions.getDefaultInstance()) {
+        if (selectorCase_ == 3 && selector_ != TransactionOptions.getDefaultInstance()) {
           selector_ =
-              com.google.spanner.v1.TransactionOptions.newBuilder(
-                      (com.google.spanner.v1.TransactionOptions) selector_)
+              TransactionOptions.newBuilder((TransactionOptions) selector_)
                   .mergeFrom(value)
                   .buildPartial();
         } else {
@@ -1217,7 +1182,7 @@ public Builder clearBegin() {
      *
      * .google.spanner.v1.TransactionOptions begin = 3;
      */
-    public com.google.spanner.v1.TransactionOptions.Builder getBeginBuilder() {
+    public TransactionOptions.Builder getBeginBuilder() {
       return getBeginFieldBuilder().getBuilder();
     }
     /**
@@ -1231,15 +1196,15 @@ public com.google.spanner.v1.TransactionOptions.Builder getBeginBuilder() {
      *
      * .google.spanner.v1.TransactionOptions begin = 3;
      */
-    @java.lang.Override
-    public com.google.spanner.v1.TransactionOptionsOrBuilder getBeginOrBuilder() {
+    @Override
+    public TransactionOptionsOrBuilder getBeginOrBuilder() {
       if ((selectorCase_ == 3) && (beginBuilder_ != null)) {
         return beginBuilder_.getMessageOrBuilder();
       } else {
         if (selectorCase_ == 3) {
-          return (com.google.spanner.v1.TransactionOptions) selector_;
+          return (TransactionOptions) selector_;
         }
-        return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+        return TransactionOptions.getDefaultInstance();
       }
     }
     /**
@@ -1254,22 +1219,16 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getBeginOrBuilder() {
      * .google.spanner.v1.TransactionOptions begin = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.TransactionOptions,
-            com.google.spanner.v1.TransactionOptions.Builder,
-            com.google.spanner.v1.TransactionOptionsOrBuilder>
+            TransactionOptions, TransactionOptions.Builder, TransactionOptionsOrBuilder>
         getBeginFieldBuilder() {
       if (beginBuilder_ == null) {
         if (!(selectorCase_ == 3)) {
-          selector_ = com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+          selector_ = TransactionOptions.getDefaultInstance();
         }
         beginBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.TransactionOptions,
-                com.google.spanner.v1.TransactionOptions.Builder,
-                com.google.spanner.v1.TransactionOptionsOrBuilder>(
-                (com.google.spanner.v1.TransactionOptions) selector_,
-                getParentForChildren(),
-                isClean());
+                TransactionOptions, TransactionOptions.Builder, TransactionOptionsOrBuilder>(
+                (TransactionOptions) selector_, getParentForChildren(), isClean());
         selector_ = null;
       }
       selectorCase_ = 3;
@@ -1278,12 +1237,12 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getBeginOrBuilder() {
       return beginBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1293,19 +1252,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.TransactionSelector)
-  private static final com.google.spanner.v1.TransactionSelector DEFAULT_INSTANCE;
+  private static final TransactionSelector DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.TransactionSelector();
+    DEFAULT_INSTANCE = new TransactionSelector();
   }
 
-  public static com.google.spanner.v1.TransactionSelector getDefaultInstance() {
+  public static TransactionSelector getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public TransactionSelector parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1318,13 +1277,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.TransactionSelector getDefaultInstanceForType() {
+  @Override
+  public TransactionSelector getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelectorOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelectorOrBuilder.java
index 8e33337d0c..d74585025c 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelectorOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelectorOrBuilder.java
@@ -50,7 +50,7 @@ public interface TransactionSelectorOrBuilder
    *
    * @return The singleUse.
    */
-  com.google.spanner.v1.TransactionOptions getSingleUse();
+  TransactionOptions getSingleUse();
   /**
    *
    *
@@ -62,7 +62,7 @@ public interface TransactionSelectorOrBuilder
    *
    * .google.spanner.v1.TransactionOptions single_use = 1;
    */
-  com.google.spanner.v1.TransactionOptionsOrBuilder getSingleUseOrBuilder();
+  TransactionOptionsOrBuilder getSingleUseOrBuilder();
 
   /**
    *
@@ -116,7 +116,7 @@ public interface TransactionSelectorOrBuilder
    *
    * @return The begin.
    */
-  com.google.spanner.v1.TransactionOptions getBegin();
+  TransactionOptions getBegin();
   /**
    *
    *
@@ -128,7 +128,7 @@ public interface TransactionSelectorOrBuilder
    *
    * .google.spanner.v1.TransactionOptions begin = 3;
    */
-  com.google.spanner.v1.TransactionOptionsOrBuilder getBeginOrBuilder();
+  TransactionOptionsOrBuilder getBeginOrBuilder();
 
-  public com.google.spanner.v1.TransactionSelector.SelectorCase getSelectorCase();
+  public TransactionSelector.SelectorCase getSelectorCase();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java
index f02ccb4e13..cb123edd18 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java
@@ -42,13 +42,13 @@ private Type() {
     code_ = 0;
   }
 
-  @java.lang.Override
+  @Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected Object newInstance(UnusedPrivateParameter unused) {
     return new Type();
   }
 
-  @java.lang.Override
+  @Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private Type(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -80,12 +80,11 @@ private Type(
             }
           case 18:
             {
-              com.google.spanner.v1.Type.Builder subBuilder = null;
+              Builder subBuilder = null;
               if (arrayElementType_ != null) {
                 subBuilder = arrayElementType_.toBuilder();
               }
-              arrayElementType_ =
-                  input.readMessage(com.google.spanner.v1.Type.parser(), extensionRegistry);
+              arrayElementType_ = input.readMessage(Type.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(arrayElementType_);
                 arrayElementType_ = subBuilder.buildPartial();
@@ -95,12 +94,11 @@ private Type(
             }
           case 26:
             {
-              com.google.spanner.v1.StructType.Builder subBuilder = null;
+              StructType.Builder subBuilder = null;
               if (structType_ != null) {
                 subBuilder = structType_.toBuilder();
               }
-              structType_ =
-                  input.readMessage(com.google.spanner.v1.StructType.parser(), extensionRegistry);
+              structType_ = input.readMessage(StructType.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(structType_);
                 structType_ = subBuilder.buildPartial();
@@ -128,15 +126,13 @@ private Type(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_Type_descriptor;
+    return TypeProto.internal_static_google_spanner_v1_Type_descriptor;
   }
 
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_Type_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.spanner.v1.Type.class, com.google.spanner.v1.Type.Builder.class);
+  @Override
+  protected FieldAccessorTable internalGetFieldAccessorTable() {
+    return TypeProto.internal_static_google_spanner_v1_Type_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(Type.class, Builder.class);
   }
 
   public static final int CODE_FIELD_NUMBER = 1;
@@ -152,7 +148,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The enum numeric value on the wire for code.
    */
-  @java.lang.Override
+  @Override
   public int getCodeValue() {
     return code_;
   }
@@ -167,15 +163,15 @@ public int getCodeValue() {
    *
    * @return The code.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TypeCode getCode() {
+  @Override
+  public TypeCode getCode() {
     @SuppressWarnings("deprecation")
-    com.google.spanner.v1.TypeCode result = com.google.spanner.v1.TypeCode.valueOf(code_);
-    return result == null ? com.google.spanner.v1.TypeCode.UNRECOGNIZED : result;
+    TypeCode result = TypeCode.valueOf(code_);
+    return result == null ? TypeCode.UNRECOGNIZED : result;
   }
 
   public static final int ARRAY_ELEMENT_TYPE_FIELD_NUMBER = 2;
-  private com.google.spanner.v1.Type arrayElementType_;
+  private Type arrayElementType_;
   /**
    *
    *
@@ -188,7 +184,7 @@ public com.google.spanner.v1.TypeCode getCode() {
    *
    * @return Whether the arrayElementType field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasArrayElementType() {
     return arrayElementType_ != null;
   }
@@ -204,11 +200,9 @@ public boolean hasArrayElementType() {
    *
    * @return The arrayElementType.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.Type getArrayElementType() {
-    return arrayElementType_ == null
-        ? com.google.spanner.v1.Type.getDefaultInstance()
-        : arrayElementType_;
+  @Override
+  public Type getArrayElementType() {
+    return arrayElementType_ == null ? Type.getDefaultInstance() : arrayElementType_;
   }
   /**
    *
@@ -220,13 +214,13 @@ public com.google.spanner.v1.Type getArrayElementType() {
    *
    * .google.spanner.v1.Type array_element_type = 2;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.TypeOrBuilder getArrayElementTypeOrBuilder() {
+  @Override
+  public TypeOrBuilder getArrayElementTypeOrBuilder() {
     return getArrayElementType();
   }
 
   public static final int STRUCT_TYPE_FIELD_NUMBER = 3;
-  private com.google.spanner.v1.StructType structType_;
+  private StructType structType_;
   /**
    *
    *
@@ -239,7 +233,7 @@ public com.google.spanner.v1.TypeOrBuilder getArrayElementTypeOrBuilder() {
    *
    * @return Whether the structType field is set.
    */
-  @java.lang.Override
+  @Override
   public boolean hasStructType() {
     return structType_ != null;
   }
@@ -255,11 +249,9 @@ public boolean hasStructType() {
    *
    * @return The structType.
    */
-  @java.lang.Override
-  public com.google.spanner.v1.StructType getStructType() {
-    return structType_ == null
-        ? com.google.spanner.v1.StructType.getDefaultInstance()
-        : structType_;
+  @Override
+  public StructType getStructType() {
+    return structType_ == null ? StructType.getDefaultInstance() : structType_;
   }
   /**
    *
@@ -271,14 +263,14 @@ public com.google.spanner.v1.StructType getStructType() {
    *
    * .google.spanner.v1.StructType struct_type = 3;
    */
-  @java.lang.Override
-  public com.google.spanner.v1.StructTypeOrBuilder getStructTypeOrBuilder() {
+  @Override
+  public StructTypeOrBuilder getStructTypeOrBuilder() {
     return getStructType();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @java.lang.Override
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -288,9 +280,9 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (code_ != com.google.spanner.v1.TypeCode.TYPE_CODE_UNSPECIFIED.getNumber()) {
+    if (code_ != TypeCode.TYPE_CODE_UNSPECIFIED.getNumber()) {
       output.writeEnum(1, code_);
     }
     if (arrayElementType_ != null) {
@@ -302,13 +294,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
-    if (code_ != com.google.spanner.v1.TypeCode.TYPE_CODE_UNSPECIFIED.getNumber()) {
+    if (code_ != TypeCode.TYPE_CODE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, code_);
     }
     if (arrayElementType_ != null) {
@@ -322,15 +314,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof com.google.spanner.v1.Type)) {
+    if (!(obj instanceof Type)) {
       return super.equals(obj);
     }
-    com.google.spanner.v1.Type other = (com.google.spanner.v1.Type) obj;
+    Type other = (Type) obj;
 
     if (code_ != other.code_) return false;
     if (hasArrayElementType() != other.hasArrayElementType()) return false;
@@ -345,7 +337,7 @@ public boolean equals(final java.lang.Object obj) {
     return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -367,70 +359,68 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.spanner.v1.Type parseFrom(java.nio.ByteBuffer data)
+  public static Type parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Type parseFrom(
+  public static Type parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.Type parseFrom(com.google.protobuf.ByteString data)
+  public static Type parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Type parseFrom(
+  public static Type 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.spanner.v1.Type parseFrom(byte[] data)
+  public static Type parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static com.google.spanner.v1.Type parseFrom(
+  public static Type parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static com.google.spanner.v1.Type parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static Type parseFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Type parseFrom(
+  public static Type 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.spanner.v1.Type parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static Type parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Type parseDelimitedFrom(
+  public static Type 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.spanner.v1.Type parseFrom(com.google.protobuf.CodedInputStream input)
+  public static Type parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static com.google.spanner.v1.Type parseFrom(
+  public static Type parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -438,7 +428,7 @@ public static com.google.spanner.v1.Type parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
+  @Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -447,17 +437,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(com.google.spanner.v1.Type prototype) {
+  public static Builder newBuilder(Type prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @java.lang.Override
+  @Override
   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) {
+  @Override
+  protected Builder newBuilderForType(BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -474,18 +464,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.Type)
-      com.google.spanner.v1.TypeOrBuilder {
+      TypeOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_Type_descriptor;
+      return TypeProto.internal_static_google_spanner_v1_Type_descriptor;
     }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.spanner.v1.TypeProto
-          .internal_static_google_spanner_v1_Type_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.spanner.v1.Type.class, com.google.spanner.v1.Type.Builder.class);
+    @Override
+    protected FieldAccessorTable internalGetFieldAccessorTable() {
+      return TypeProto.internal_static_google_spanner_v1_Type_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(Type.class, Builder.class);
     }
 
     // Construct using com.google.spanner.v1.Type.newBuilder()
@@ -493,7 +480,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -502,7 +489,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @java.lang.Override
+    @Override
     public Builder clear() {
       super.clear();
       code_ = 0;
@@ -522,28 +509,28 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_Type_descriptor;
+      return TypeProto.internal_static_google_spanner_v1_Type_descriptor;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Type getDefaultInstanceForType() {
-      return com.google.spanner.v1.Type.getDefaultInstance();
+    @Override
+    public Type getDefaultInstanceForType() {
+      return Type.getDefaultInstance();
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Type build() {
-      com.google.spanner.v1.Type result = buildPartial();
+    @Override
+    public Type build() {
+      Type result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @java.lang.Override
-    public com.google.spanner.v1.Type buildPartial() {
-      com.google.spanner.v1.Type result = new com.google.spanner.v1.Type(this);
+    @Override
+    public Type buildPartial() {
+      Type result = new Type(this);
       result.code_ = code_;
       if (arrayElementTypeBuilder_ == null) {
         result.arrayElementType_ = arrayElementType_;
@@ -559,51 +546,50 @@ public com.google.spanner.v1.Type buildPartial() {
       return result;
     }
 
-    @java.lang.Override
+    @Override
     public Builder clone() {
       return super.clone();
     }
 
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+    @Override
+    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.setField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @java.lang.Override
+    @Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @java.lang.Override
+    @Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.spanner.v1.Type) {
-        return mergeFrom((com.google.spanner.v1.Type) other);
+      if (other instanceof Type) {
+        return mergeFrom((Type) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.spanner.v1.Type other) {
-      if (other == com.google.spanner.v1.Type.getDefaultInstance()) return this;
+    public Builder mergeFrom(Type other) {
+      if (other == Type.getDefaultInstance()) return this;
       if (other.code_ != 0) {
         setCodeValue(other.getCodeValue());
       }
@@ -618,21 +604,21 @@ public Builder mergeFrom(com.google.spanner.v1.Type other) {
       return this;
     }
 
-    @java.lang.Override
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.spanner.v1.Type parsedMessage = null;
+      Type parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.spanner.v1.Type) e.getUnfinishedMessage();
+        parsedMessage = (Type) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -654,7 +640,7 @@ public Builder mergeFrom(
      *
      * @return The enum numeric value on the wire for code.
      */
-    @java.lang.Override
+    @Override
     public int getCodeValue() {
       return code_;
     }
@@ -687,11 +673,11 @@ public Builder setCodeValue(int value) {
      *
      * @return The code.
      */
-    @java.lang.Override
-    public com.google.spanner.v1.TypeCode getCode() {
+    @Override
+    public TypeCode getCode() {
       @SuppressWarnings("deprecation")
-      com.google.spanner.v1.TypeCode result = com.google.spanner.v1.TypeCode.valueOf(code_);
-      return result == null ? com.google.spanner.v1.TypeCode.UNRECOGNIZED : result;
+      TypeCode result = TypeCode.valueOf(code_);
+      return result == null ? TypeCode.UNRECOGNIZED : result;
     }
     /**
      *
@@ -705,7 +691,7 @@ public com.google.spanner.v1.TypeCode getCode() {
      * @param value The code to set.
      * @return This builder for chaining.
      */
-    public Builder setCode(com.google.spanner.v1.TypeCode value) {
+    public Builder setCode(TypeCode value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -732,11 +718,8 @@ public Builder clearCode() {
       return this;
     }
 
-    private com.google.spanner.v1.Type arrayElementType_;
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Type,
-            com.google.spanner.v1.Type.Builder,
-            com.google.spanner.v1.TypeOrBuilder>
+    private Type arrayElementType_;
+    private com.google.protobuf.SingleFieldBuilderV3
         arrayElementTypeBuilder_;
     /**
      *
@@ -765,11 +748,9 @@ public boolean hasArrayElementType() {
      *
      * @return The arrayElementType.
      */
-    public com.google.spanner.v1.Type getArrayElementType() {
+    public Type getArrayElementType() {
       if (arrayElementTypeBuilder_ == null) {
-        return arrayElementType_ == null
-            ? com.google.spanner.v1.Type.getDefaultInstance()
-            : arrayElementType_;
+        return arrayElementType_ == null ? Type.getDefaultInstance() : arrayElementType_;
       } else {
         return arrayElementTypeBuilder_.getMessage();
       }
@@ -784,7 +765,7 @@ public com.google.spanner.v1.Type getArrayElementType() {
      *
      * .google.spanner.v1.Type array_element_type = 2;
      */
-    public Builder setArrayElementType(com.google.spanner.v1.Type value) {
+    public Builder setArrayElementType(Type value) {
       if (arrayElementTypeBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -807,7 +788,7 @@ public Builder setArrayElementType(com.google.spanner.v1.Type value) {
      *
      * .google.spanner.v1.Type array_element_type = 2;
      */
-    public Builder setArrayElementType(com.google.spanner.v1.Type.Builder builderForValue) {
+    public Builder setArrayElementType(Builder builderForValue) {
       if (arrayElementTypeBuilder_ == null) {
         arrayElementType_ = builderForValue.build();
         onChanged();
@@ -827,13 +808,10 @@ public Builder setArrayElementType(com.google.spanner.v1.Type.Builder builderFor
      *
      * .google.spanner.v1.Type array_element_type = 2;
      */
-    public Builder mergeArrayElementType(com.google.spanner.v1.Type value) {
+    public Builder mergeArrayElementType(Type value) {
       if (arrayElementTypeBuilder_ == null) {
         if (arrayElementType_ != null) {
-          arrayElementType_ =
-              com.google.spanner.v1.Type.newBuilder(arrayElementType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+          arrayElementType_ = Type.newBuilder(arrayElementType_).mergeFrom(value).buildPartial();
         } else {
           arrayElementType_ = value;
         }
@@ -875,7 +853,7 @@ public Builder clearArrayElementType() {
      *
      * .google.spanner.v1.Type array_element_type = 2;
      */
-    public com.google.spanner.v1.Type.Builder getArrayElementTypeBuilder() {
+    public Builder getArrayElementTypeBuilder() {
 
       onChanged();
       return getArrayElementTypeFieldBuilder().getBuilder();
@@ -890,13 +868,11 @@ public com.google.spanner.v1.Type.Builder getArrayElementTypeBuilder() {
      *
      * .google.spanner.v1.Type array_element_type = 2;
      */
-    public com.google.spanner.v1.TypeOrBuilder getArrayElementTypeOrBuilder() {
+    public TypeOrBuilder getArrayElementTypeOrBuilder() {
       if (arrayElementTypeBuilder_ != null) {
         return arrayElementTypeBuilder_.getMessageOrBuilder();
       } else {
-        return arrayElementType_ == null
-            ? com.google.spanner.v1.Type.getDefaultInstance()
-            : arrayElementType_;
+        return arrayElementType_ == null ? Type.getDefaultInstance() : arrayElementType_;
       }
     }
     /**
@@ -909,28 +885,20 @@ public com.google.spanner.v1.TypeOrBuilder getArrayElementTypeOrBuilder() {
      *
      * .google.spanner.v1.Type array_element_type = 2;
      */
-    private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.Type,
-            com.google.spanner.v1.Type.Builder,
-            com.google.spanner.v1.TypeOrBuilder>
+    private com.google.protobuf.SingleFieldBuilderV3
         getArrayElementTypeFieldBuilder() {
       if (arrayElementTypeBuilder_ == null) {
         arrayElementTypeBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.Type,
-                com.google.spanner.v1.Type.Builder,
-                com.google.spanner.v1.TypeOrBuilder>(
+            new com.google.protobuf.SingleFieldBuilderV3(
                 getArrayElementType(), getParentForChildren(), isClean());
         arrayElementType_ = null;
       }
       return arrayElementTypeBuilder_;
     }
 
-    private com.google.spanner.v1.StructType structType_;
+    private StructType structType_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.StructType,
-            com.google.spanner.v1.StructType.Builder,
-            com.google.spanner.v1.StructTypeOrBuilder>
+            StructType, StructType.Builder, StructTypeOrBuilder>
         structTypeBuilder_;
     /**
      *
@@ -959,11 +927,9 @@ public boolean hasStructType() {
      *
      * @return The structType.
      */
-    public com.google.spanner.v1.StructType getStructType() {
+    public StructType getStructType() {
       if (structTypeBuilder_ == null) {
-        return structType_ == null
-            ? com.google.spanner.v1.StructType.getDefaultInstance()
-            : structType_;
+        return structType_ == null ? StructType.getDefaultInstance() : structType_;
       } else {
         return structTypeBuilder_.getMessage();
       }
@@ -978,7 +944,7 @@ public com.google.spanner.v1.StructType getStructType() {
      *
      * .google.spanner.v1.StructType struct_type = 3;
      */
-    public Builder setStructType(com.google.spanner.v1.StructType value) {
+    public Builder setStructType(StructType value) {
       if (structTypeBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1001,7 +967,7 @@ public Builder setStructType(com.google.spanner.v1.StructType value) {
      *
      * .google.spanner.v1.StructType struct_type = 3;
      */
-    public Builder setStructType(com.google.spanner.v1.StructType.Builder builderForValue) {
+    public Builder setStructType(StructType.Builder builderForValue) {
       if (structTypeBuilder_ == null) {
         structType_ = builderForValue.build();
         onChanged();
@@ -1021,13 +987,10 @@ public Builder setStructType(com.google.spanner.v1.StructType.Builder builderFor
      *
      * .google.spanner.v1.StructType struct_type = 3;
      */
-    public Builder mergeStructType(com.google.spanner.v1.StructType value) {
+    public Builder mergeStructType(StructType value) {
       if (structTypeBuilder_ == null) {
         if (structType_ != null) {
-          structType_ =
-              com.google.spanner.v1.StructType.newBuilder(structType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+          structType_ = StructType.newBuilder(structType_).mergeFrom(value).buildPartial();
         } else {
           structType_ = value;
         }
@@ -1069,7 +1032,7 @@ public Builder clearStructType() {
      *
      * .google.spanner.v1.StructType struct_type = 3;
      */
-    public com.google.spanner.v1.StructType.Builder getStructTypeBuilder() {
+    public StructType.Builder getStructTypeBuilder() {
 
       onChanged();
       return getStructTypeFieldBuilder().getBuilder();
@@ -1084,13 +1047,11 @@ public com.google.spanner.v1.StructType.Builder getStructTypeBuilder() {
      *
      * .google.spanner.v1.StructType struct_type = 3;
      */
-    public com.google.spanner.v1.StructTypeOrBuilder getStructTypeOrBuilder() {
+    public StructTypeOrBuilder getStructTypeOrBuilder() {
       if (structTypeBuilder_ != null) {
         return structTypeBuilder_.getMessageOrBuilder();
       } else {
-        return structType_ == null
-            ? com.google.spanner.v1.StructType.getDefaultInstance()
-            : structType_;
+        return structType_ == null ? StructType.getDefaultInstance() : structType_;
       }
     }
     /**
@@ -1104,28 +1065,24 @@ public com.google.spanner.v1.StructTypeOrBuilder getStructTypeOrBuilder() {
      * .google.spanner.v1.StructType struct_type = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.spanner.v1.StructType,
-            com.google.spanner.v1.StructType.Builder,
-            com.google.spanner.v1.StructTypeOrBuilder>
+            StructType, StructType.Builder, StructTypeOrBuilder>
         getStructTypeFieldBuilder() {
       if (structTypeBuilder_ == null) {
         structTypeBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.spanner.v1.StructType,
-                com.google.spanner.v1.StructType.Builder,
-                com.google.spanner.v1.StructTypeOrBuilder>(
+                StructType, StructType.Builder, StructTypeOrBuilder>(
                 getStructType(), getParentForChildren(), isClean());
         structType_ = null;
       }
       return structTypeBuilder_;
     }
 
-    @java.lang.Override
+    @Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @java.lang.Override
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1135,19 +1092,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.Type)
-  private static final com.google.spanner.v1.Type DEFAULT_INSTANCE;
+  private static final Type DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new com.google.spanner.v1.Type();
+    DEFAULT_INSTANCE = new Type();
   }
 
-  public static com.google.spanner.v1.Type getDefaultInstance() {
+  public static Type getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
+        @Override
         public Type parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1160,13 +1117,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
-  public com.google.spanner.v1.Type getDefaultInstanceForType() {
+  @Override
+  public Type getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeCode.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeCode.java
index 77d751575c..4bbe65e875 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeCode.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeCode.java
@@ -295,8 +295,7 @@ public enum TypeCode implements com.google.protobuf.ProtocolMessageEnum {
 
   public final int getNumber() {
     if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
-          "Can't get the number of an unknown enum value.");
+      throw new IllegalArgumentException("Can't get the number of an unknown enum value.");
     }
     return value;
   }
@@ -306,7 +305,7 @@ public final int getNumber() {
    * @return The enum associated with the given numeric wire value.
    * @deprecated Use {@link #forNumber(int)} instead.
    */
-  @java.lang.Deprecated
+  @Deprecated
   public static TypeCode valueOf(int value) {
     return forNumber(value);
   }
@@ -357,8 +356,7 @@ public TypeCode findValueByNumber(int number) {
 
   public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
     if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalStateException(
-          "Can't get the descriptor of an unrecognized enum value.");
+      throw new IllegalStateException("Can't get the descriptor of an unrecognized enum value.");
     }
     return getDescriptor().getValues().get(ordinal());
   }
@@ -368,14 +366,14 @@ public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType
   }
 
   public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-    return com.google.spanner.v1.TypeProto.getDescriptor().getEnumTypes().get(0);
+    return TypeProto.getDescriptor().getEnumTypes().get(0);
   }
 
   private static final TypeCode[] VALUES = values();
 
   public static TypeCode valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
     if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+      throw new IllegalArgumentException("EnumValueDescriptor is not for this type.");
     }
     if (desc.getIndex() == -1) {
       return UNRECOGNIZED;
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeOrBuilder.java
index bd37d1e7d2..de0fa37d79 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeOrBuilder.java
@@ -46,7 +46,7 @@ public interface TypeOrBuilder
    *
    * @return The code.
    */
-  com.google.spanner.v1.TypeCode getCode();
+  TypeCode getCode();
 
   /**
    *
@@ -73,7 +73,7 @@ public interface TypeOrBuilder
    *
    * @return The arrayElementType.
    */
-  com.google.spanner.v1.Type getArrayElementType();
+  Type getArrayElementType();
   /**
    *
    *
@@ -84,7 +84,7 @@ public interface TypeOrBuilder
    *
    * .google.spanner.v1.Type array_element_type = 2;
    */
-  com.google.spanner.v1.TypeOrBuilder getArrayElementTypeOrBuilder();
+  TypeOrBuilder getArrayElementTypeOrBuilder();
 
   /**
    *
@@ -111,7 +111,7 @@ public interface TypeOrBuilder
    *
    * @return The structType.
    */
-  com.google.spanner.v1.StructType getStructType();
+  StructType getStructType();
   /**
    *
    *
@@ -122,5 +122,5 @@ public interface TypeOrBuilder
    *
    * .google.spanner.v1.StructType struct_type = 3;
    */
-  com.google.spanner.v1.StructTypeOrBuilder getStructTypeOrBuilder();
+  StructTypeOrBuilder getStructTypeOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
index 042f242919..ad6000d087 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
@@ -47,7 +47,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
   static {
-    java.lang.String[] descriptorData = {
+    String[] descriptorData = {
       "\n\034google/spanner/v1/type.proto\022\021google.s"
           + "panner.v1\032\037google/api/field_behavior.pro"
           + "to\032\034google/api/annotations.proto\"\237\001\n\004Typ"
@@ -79,7 +79,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_Type_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_Type_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Code", "ArrayElementType", "StructType",
             });
     internal_static_google_spanner_v1_StructType_descriptor =
@@ -87,7 +87,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_StructType_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_StructType_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Fields",
             });
     internal_static_google_spanner_v1_StructType_Field_descriptor =
@@ -95,7 +95,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_StructType_Field_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_StructType_Field_descriptor,
-            new java.lang.String[] {
+            new String[] {
               "Name", "Type",
             });
     com.google.protobuf.ExtensionRegistry registry =

From 552f26ff671de8557cac5c9ca9791fcef756749d Mon Sep 17 00:00:00 2001
From: Mayur Kale 
Date: Tue, 3 Nov 2020 11:32:02 -0800
Subject: [PATCH 02/12] fix: code reviews

---
 .../com/google/cloud/spanner/AbstractReadContext.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
index d6f78877ff..ba087642fe 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
@@ -713,6 +713,15 @@ public void close() {
   @Nullable
   abstract TransactionSelector getTransactionSelector();
 
+  /**
+   * Returns the transaction tag for this {@link AbstractReadContext} or null if this
+   * {@link AbstractReadContext} does not have a transaction tag.
+   */
+  @Nullable
+  String getTransactionTag() {
+    return null;
+  }
+
   /** This method is called when a statement returned a new transaction as part of its results. */
   @Override
   public void onTransactionMetadata(Transaction transaction, boolean shouldIncludeId) {}
@@ -761,6 +770,7 @@ ResultSet readInternalWithOptions(
       builder.setPartitionToken(partitionToken);
     }
     if (readOptions.hasTag()) {
+      // TODO: set transaction tag when executed within a RW transaction
       builder.setRequestOptions(
           RequestOptions.newBuilder().setRequestTag(readOptions.tag()).build());
     }

From b65b54496a56889e82499741a400fdfe2f58154d Mon Sep 17 00:00:00 2001
From: Mayur Kale 
Date: Tue, 3 Nov 2020 12:11:12 -0800
Subject: [PATCH 03/12] fix: combine boiler plate code

---
 .../src/main/java/com/google/cloud/spanner/SessionImpl.java  | 1 +
 .../test/java/com/google/cloud/spanner/SessionPoolTest.java  | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
index ef219d5510..47cd7d7ccc 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
@@ -140,6 +140,7 @@ public CommitResponse writeWithOptions(Iterable mutations, Transaction
         mutations instanceof java.util.Collection
             ? (Collection) mutations
             : Lists.newArrayList(mutations);
+    final Options opt = Options.fromTransactionOptions(options);
     runner.run(
         new TransactionRunner.TransactionCallable() {
           @Override
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
index 337510757d..47aecca090 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
@@ -1103,10 +1103,15 @@ public void testSessionNotFoundWriteAtLeastOnce() {
     when(closedSession.writeAtLeastOnceWithOptions(mutations)).thenThrow(sessionNotFound);
 
     final SessionImpl openSession = mockSession();
+<<<<<<< HEAD
     com.google.cloud.spanner.CommitResponse response =
         mock(com.google.cloud.spanner.CommitResponse.class);
     when(response.getCommitTimestamp()).thenReturn(Timestamp.now());
     when(openSession.writeAtLeastOnceWithOptions(mutations)).thenReturn(response);
+=======
+    when(openSession.writeAtLeastOnceWithOptions(mutations))
+        .thenReturn(new com.google.cloud.spanner.CommitResponse(Timestamp.now()));
+>>>>>>> 33eb6e9c (fix: combine boiler plate code)
     doAnswer(
             new Answer() {
               @Override

From f409761b92efbda880746bd7b44b784011d272f9 Mon Sep 17 00:00:00 2001
From: Mayur Kale 
Date: Tue, 3 Nov 2020 15:39:54 -0800
Subject: [PATCH 04/12] fix: use buildRequestOptions in readInternalWithOptions

---
 .../com/google/cloud/spanner/AbstractReadContext.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
index ba087642fe..91a573a4c5 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
@@ -769,11 +769,9 @@ ResultSet readInternalWithOptions(
     if (partitionToken != null) {
       builder.setPartitionToken(partitionToken);
     }
-    if (readOptions.hasTag()) {
-      // TODO: set transaction tag when executed within a RW transaction
-      builder.setRequestOptions(
-          RequestOptions.newBuilder().setRequestTag(readOptions.tag()).build());
-    }
+    // TODO: set transaction tag when executed within a RW transaction
+    builder.setRequestOptions(buildRequestOptions(readOptions, null));
+
     final int prefetchChunks =
         readOptions.hasPrefetchChunks() ? readOptions.prefetchChunks() : defaultPrefetchChunks;
     ResumableStreamIterator stream =

From 65c7b4cf048684a97cb436645d6ce64327c37446 Mon Sep 17 00:00:00 2001
From: Mayur Kale 
Date: Tue, 29 Dec 2020 19:10:37 -0800
Subject: [PATCH 05/12] refactor

---
 .../cloud/spanner/AbstractReadContext.java    |  4 +--
 .../google/cloud/spanner/DatabaseClient.java  |  3 +-
 .../com/google/cloud/spanner/Options.java     |  6 ++--
 .../com/google/cloud/spanner/SessionPool.java | 36 +++++++++----------
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
index 91a573a4c5..81ce3c42e8 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
@@ -539,8 +539,8 @@ private ResultSet executeQueryInternal(
    *   
  • Specific {@link QueryOptions} passed in for this query.
    *   
  • Any value specified in a valid environment variable when the {@link SpannerOptions}
    *       instance was created.
-   *   
  • The default {@link SpannerOptions#getDefaultQueryOptions(DatabaseId)} specified for the
-   *       database where the query is executed.
+   *   
  • The default {@link SpannerOptions#getDefaultQueryOptions()} specified for the database
+   *       where the query is executed.
    * 
    */
   @VisibleForTesting
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java
index 0f115534af..215d86c825 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java
@@ -545,8 +545,7 @@ CommitResponse writeAtLeastOnceWithOptions(
    * execution strategy that provides different, and often better, scalability properties for large,
    * table-wide operations than DML in a {@link #readWriteTransaction()} transaction. Smaller scoped
    * statements, such as an OLTP workload, should prefer using {@link
-   * TransactionContext#executeUpdate(Statement, UpdateOption...)} with {@link
-   * #readWriteTransaction()}.
+   * TransactionContext#executeUpdate(Statement)} with {@link #readWriteTransaction()}.
    *
    * 
    That said, Partitioned DML is not a drop-in replacement for standard DML used in {@link
    * #readWriteTransaction()}.
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
index 71f7b26970..5bef094def 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
@@ -44,13 +44,13 @@ private RpcPriority(Priority proto) {
   /** Marker interface to mark options applicable to both Read and Query operations */
   public interface ReadAndQueryOption extends ReadOption, QueryOption {}
 
+  /** Marker interface to mark options applicable to read operation */
+  public interface ReadOption {}
+
   /** Marker interface to mark options applicable to Read, Query, Update and Write operations */
   public interface ReadQueryUpdateTransactionOption
       extends ReadOption, QueryOption, UpdateOption, TransactionOption {}
 
-  /** Marker interface to mark options applicable to read operation */
-  public interface ReadOption {}
-
   /** Marker interface to mark options applicable to query operation. */
   public interface QueryOption {}
 
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 a342673c25..0d5f36b5c1 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
@@ -681,15 +681,6 @@ public Struct apply(SessionNotFoundException input) {
       }
     }
 
-    @Override
-    public long executeUpdate(Statement statement, UpdateOption... options) {
-      try {
-        return delegate.executeUpdate(statement, options);
-      } catch (SessionNotFoundException e) {
-        throw handler.handleSessionNotFound(e);
-      }
-    }
-
     @Override
     public void buffer(Mutation mutation) {
       delegate.buffer(mutation);
@@ -704,15 +695,6 @@ public Struct readRowUsingIndex(String table, String index, Key key, Iterable statements, UpdateOption... options) {
-      try {
-        return delegate.batchUpdate(statements, options);
-      } catch (SessionNotFoundException e) {
-        throw handler.handleSessionNotFound(e);
-      }
-    }
-
     @Override
     public ApiFuture readRowUsingIndexAsync(
         String table, String index, Key key, Iterable columns) {
@@ -735,6 +717,15 @@ public void buffer(Iterable mutations) {
       delegate.buffer(mutations);
     }
 
+    @Override
+    public long executeUpdate(Statement statement, UpdateOption... options) {
+      try {
+        return delegate.executeUpdate(statement, options);
+      } catch (SessionNotFoundException e) {
+        throw handler.handleSessionNotFound(e);
+      }
+    }
+
     @Override
     public ApiFuture executeUpdateAsync(Statement statement, UpdateOption... options) {
       return ApiFutures.catching(
@@ -749,6 +740,15 @@ public Long apply(SessionNotFoundException input) {
           MoreExecutors.directExecutor());
     }
 
+    @Override
+    public long[] batchUpdate(Iterable statements, UpdateOption... options) {
+      try {
+        return delegate.batchUpdate(statements, options);
+      } catch (SessionNotFoundException e) {
+        throw handler.handleSessionNotFound(e);
+      }
+    }
+
     @Override
     public ApiFuture batchUpdateAsync(
         Iterable statements, UpdateOption... options) {

From c70bd6f16ccc723b4f53aa5f49eb39790fe462d1 Mon Sep 17 00:00:00 2001
From: Mayur Kale 
Date: Tue, 29 Dec 2020 19:17:41 -0800
Subject: [PATCH 06/12] refactor2

---
 .../com/google/cloud/spanner/Options.java     |  6 ++--
 .../com/google/cloud/spanner/SessionImpl.java |  1 -
 .../cloud/spanner/TransactionContext.java     | 28 +++++++++----------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
index 5bef094def..9ab5e949e1 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
@@ -402,13 +402,13 @@ static Options fromReadOptions(ReadOption... options) {
   }
 
   static Options fromQueryOptions(QueryOption... options) {
-    Options queryOptions = new Options();
+    Options readOptions = new Options();
     for (QueryOption option : options) {
       if (option instanceof InternalOption) {
-        ((InternalOption) option).appendToOptions(queryOptions);
+        ((InternalOption) option).appendToOptions(readOptions);
       }
     }
-    return queryOptions;
+    return readOptions;
   }
 
   static Options fromUpdateOptions(UpdateOption... options) {
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
index 47cd7d7ccc..ef219d5510 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
@@ -140,7 +140,6 @@ public CommitResponse writeWithOptions(Iterable mutations, Transaction
         mutations instanceof java.util.Collection
             ? (Collection) mutations
             : Lists.newArrayList(mutations);
-    final Options opt = Options.fromTransactionOptions(options);
     runner.run(
         new TransactionRunner.TransactionCallable() {
           @Override
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionContext.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionContext.java
index e940c25875..64c45b12c0 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionContext.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionContext.java
@@ -106,13 +106,13 @@ public interface TransactionContext extends ReadContext {
   long executeUpdate(Statement statement, UpdateOption... options);
 
   /**
-   * Same as {@link #executeUpdate(Statement, UpdateOption...)}, but is guaranteed to be
-   * non-blocking. If multiple asynchronous update statements are submitted to the same read/write
-   * transaction, the statements are guaranteed to be submitted to Cloud Spanner in the order that
-   * they were submitted in the client. This does however not guarantee that an asynchronous update
-   * statement will see the results of all previously submitted statements, as the execution of the
-   * statements can be parallel. If you rely on the results of a previous statement, you should
-   * block until the result of that statement is known and has been returned to the client.
+   * Same as {@link #executeUpdate(Statement)}, but is guaranteed to be non-blocking. If multiple
+   * asynchronous update statements are submitted to the same read/write transaction, the statements
+   * are guaranteed to be submitted to Cloud Spanner in the order that they were submitted in the
+   * client. This does however not guarantee that an asynchronous update statement will see the
+   * results of all previously submitted statements, as the execution of the statements can be
+   * parallel. If you rely on the results of a previous statement, you should block until the result
+   * of that statement is known and has been returned to the client.
    */
   ApiFuture executeUpdateAsync(Statement statement, UpdateOption... options);
 
@@ -134,13 +134,13 @@ public interface TransactionContext extends ReadContext {
   long[] batchUpdate(Iterable statements, UpdateOption... options);
 
   /**
-   * Same as {@link #batchUpdate(Iterable, UpdateOption...)}, but is guaranteed to be non-blocking.
-   * If multiple asynchronous update statements are submitted to the same read/write transaction,
-   * the statements are guaranteed to be submitted to Cloud Spanner in the order that they were
-   * submitted in the client. This does however not guarantee that an asynchronous update statement
-   * will see the results of all previously submitted statements, as the execution of the statements
-   * can be parallel. If you rely on the results of a previous statement, you should block until the
-   * result of that statement is known and has been returned to the client.
+   * Same as {@link #batchUpdate(Iterable)}, but is guaranteed to be non-blocking. If multiple
+   * asynchronous update statements are submitted to the same read/write transaction, the statements
+   * are guaranteed to be submitted to Cloud Spanner in the order that they were submitted in the
+   * client. This does however not guarantee that an asynchronous update statement will see the
+   * results of all previously submitted statements, as the execution of the statements can be
+   * parallel. If you rely on the results of a previous statement, you should block until the result
+   * of that statement is known and has been returned to the client.
    */
   ApiFuture batchUpdateAsync(Iterable statements, UpdateOption... options);
 }

From fa5891fff077a6bc965907bf9d2746b93a316441 Mon Sep 17 00:00:00 2001
From: Mayur Kale 
Date: Thu, 31 Dec 2020 18:05:37 -0800
Subject: [PATCH 07/12] fix code reviews

---
 .../cloud/spanner/AbstractReadContext.java    |  5 +-
 .../com/google/cloud/spanner/Options.java     |  2 +-
 .../cloud/spanner/TransactionRunnerImpl.java  |  6 +++
 .../spanner/AbstractReadContextTest.java      | 49 ++++++++++++++++++-
 4 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
index 81ce3c42e8..b43f8499b8 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
@@ -600,7 +600,7 @@ ExecuteSqlRequest.Builder getExecuteSqlRequestBuilder(
   }
 
   ExecuteBatchDmlRequest.Builder getExecuteBatchDmlRequestBuilder(
-      Iterable statements, Options options, String txnTag) {
+      Iterable statements, Options options) {
     ExecuteBatchDmlRequest.Builder builder =
         ExecuteBatchDmlRequest.newBuilder().setSession(session.getName());
     int idx = 0;
@@ -769,8 +769,7 @@ ResultSet readInternalWithOptions(
     if (partitionToken != null) {
       builder.setPartitionToken(partitionToken);
     }
-    // TODO: set transaction tag when executed within a RW transaction
-    builder.setRequestOptions(buildRequestOptions(readOptions, null));
+    builder.setRequestOptions(buildRequestOptions(readOptions));
 
     final int prefetchChunks =
         readOptions.hasPrefetchChunks() ? readOptions.prefetchChunks() : defaultPrefetchChunks;
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
index 9ab5e949e1..401ade8045 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
@@ -103,7 +103,7 @@ public static ReadQueryUpdateTransactionOption priority(RpcPriority priority) {
 
   /**
    * Specifying this will cause the reads, queries, updates and writes operations statistics
-   * collection grouped by tag.
+   * collection to be grouped by tag.
    */
   public static ReadQueryUpdateTransactionOption tag(String name) {
     return new TagOption(name);
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
index 0fd9817b8c..cbf84991eb 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
@@ -534,6 +534,12 @@ public void onTransactionMetadata(Transaction transaction, boolean shouldInclude
       }
     }
 
+    @Nullable
+    String getTransactionTag() {
+      if (this.options.hasTag()) return this.options.tag();
+      return null;
+    }
+
     @Override
     public SpannerException onError(SpannerException e, boolean withBeginTransaction) {
       // If the statement that caused an error was the statement that included a BeginTransaction
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java
index 3b2d04ffe6..519364ba69 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java
@@ -64,6 +64,14 @@ TestReadContext build() {
     }
   }
 
+  class TestReadContextWithTagBuilder
+      extends AbstractReadContext.Builder {
+    @Override
+    TestReadContextWithTag build() {
+      return new TestReadContextWithTag(this);
+    }
+  }
+
   private final class TestReadContext extends AbstractReadContext {
     TestReadContext(TestReadContextBuilder builder) {
       super(builder);
@@ -75,6 +83,21 @@ TransactionSelector getTransactionSelector() {
     }
   }
 
+  private final class TestReadContextWithTag extends AbstractReadContext {
+    TestReadContextWithTag(TestReadContextWithTagBuilder builder) {
+      super(builder);
+    }
+
+    @Override
+    TransactionSelector getTransactionSelector() {
+      return TransactionSelector.getDefaultInstance();
+    }
+
+    String getTransactionTag() {
+      return "transaction-tag";
+    }
+  }
+
   private TestReadContext context;
 
   @Before
@@ -169,11 +192,35 @@ public void executeSqlRequestBuilderWithRequestOptions() {
             .getExecuteSqlRequestBuilder(
                 Statement.newBuilder("SELECT FOO FROM BAR").build(),
                 QueryMode.NORMAL,
-                Options.fromUpdateOptions(Options.tag("tag-1")))
+                Options.fromUpdateOptions(Options.tag("tag-1")), false)
             .build();
     assertThat(request.getSql()).isEqualTo("SELECT FOO FROM BAR");
     assertThat(request.getRequestOptions().getRequestTag()).isEqualTo("tag-1");
     assertThat(request.getRequestOptions().getTransactionTag()).isEmpty();
   }
+
+  @Test
+  public void executeSqlRequestBuilderWithRequestOptionsWithTxnTag() {
+    SessionImpl session = mock(SessionImpl.class);
+    when(session.getName()).thenReturn("session-1");
+    TestReadContextWithTagBuilder builder = new TestReadContextWithTagBuilder();
+    TestReadContextWithTag contextWithTag =
+        builder
+            .setSession(session)
+            .setRpc(mock(SpannerRpc.class))
+            .setDefaultQueryOptions(defaultQueryOptions)
+            .setExecutorProvider(mock(ExecutorProvider.class))
+            .build();
+
+    ExecuteSqlRequest request =
+        contextWithTag
+            .getExecuteSqlRequestBuilder(
+                Statement.newBuilder("SELECT FOO FROM BAR").build(),
+                QueryMode.NORMAL,
+                Options.fromUpdateOptions(Options.tag("tag-1")), false)
+            .build();
+    assertThat(request.getSql()).isEqualTo("SELECT FOO FROM BAR");
+    assertThat(request.getRequestOptions().getRequestTag()).isEqualTo("tag-1");
+    assertThat(request.getRequestOptions().getTransactionTag()).isEqualTo("transaction-tag");
   }
 }

From 2a49d4f1fb9ea7a1d38eacd2c823e31acc72ea38 Mon Sep 17 00:00:00 2001
From: Mayur Kale 
Date: Wed, 31 Mar 2021 12:24:13 -0700
Subject: [PATCH 08/12] chore: rebase requestoption proto

---
 .../cloud/spanner/AbstractReadContext.java    |    2 -
 .../com/google/cloud/spanner/Options.java     |    1 -
 .../spanner/AbstractReadContextTest.java      |    6 +-
 .../google/cloud/spanner/SessionPoolTest.java |    5 -
 .../v1/BatchCreateSessionsRequest.java        |  289 ++--
 .../BatchCreateSessionsRequestOrBuilder.java  |    6 +-
 .../v1/BatchCreateSessionsResponse.java       |  266 ++--
 .../BatchCreateSessionsResponseOrBuilder.java |    8 +-
 .../spanner/v1/BeginTransactionRequest.java   |  110 +-
 .../v1/BeginTransactionRequestOrBuilder.java  |    4 +-
 .../com/google/spanner/v1/CommitRequest.java  |  190 +--
 .../spanner/v1/CommitRequestOrBuilder.java    |   17 +-
 .../com/google/spanner/v1/CommitResponse.java |  120 +-
 .../spanner/v1/CreateSessionRequest.java      |  276 ++--
 .../v1/CreateSessionRequestOrBuilder.java     |    6 +-
 .../spanner/v1/DeleteSessionRequest.java      |  222 ++--
 .../v1/DeleteSessionRequestOrBuilder.java     |    2 +-
 .../spanner/v1/ExecuteBatchDmlRequest.java    |  278 ++--
 .../v1/ExecuteBatchDmlRequestOrBuilder.java   |   15 +-
 .../spanner/v1/ExecuteBatchDmlResponse.java   |  267 ++--
 .../v1/ExecuteBatchDmlResponseOrBuilder.java  |    8 +-
 .../google/spanner/v1/ExecuteSqlRequest.java  |  322 ++---
 .../v1/ExecuteSqlRequestOrBuilder.java        |   25 +-
 .../google/spanner/v1/GetSessionRequest.java  |  222 ++--
 .../v1/GetSessionRequestOrBuilder.java        |    2 +-
 .../java/com/google/spanner/v1/KeyRange.java  |  239 ++--
 .../google/spanner/v1/KeyRangeOrBuilder.java  |    4 +-
 .../java/com/google/spanner/v1/KeySet.java    |  266 ++--
 .../google/spanner/v1/KeySetOrBuilder.java    |    8 +-
 .../java/com/google/spanner/v1/KeysProto.java |    6 +-
 .../spanner/v1/ListSessionsRequest.java       |  312 +++--
 .../v1/ListSessionsRequestOrBuilder.java      |    6 +-
 .../spanner/v1/ListSessionsResponse.java      |  305 +++--
 .../v1/ListSessionsResponseOrBuilder.java     |   10 +-
 .../java/com/google/spanner/v1/Mutation.java  | 1181 ++++++++++-------
 .../google/spanner/v1/MutationOrBuilder.java  |   22 +-
 .../com/google/spanner/v1/MutationProto.java  |   12 +-
 .../google/spanner/v1/PartialResultSet.java   |  313 +++--
 .../spanner/v1/PartialResultSetOrBuilder.java |    8 +-
 .../java/com/google/spanner/v1/Partition.java |  178 +--
 .../google/spanner/v1/PartitionOptions.java   |  185 +--
 .../spanner/v1/PartitionQueryRequest.java     |  527 ++++----
 .../v1/PartitionQueryRequestOrBuilder.java    |   25 +-
 .../spanner/v1/PartitionReadRequest.java      |  492 ++++---
 .../v1/PartitionReadRequestOrBuilder.java     |   22 +-
 .../google/spanner/v1/PartitionResponse.java  |  322 +++--
 .../v1/PartitionResponseOrBuilder.java        |   12 +-
 .../java/com/google/spanner/v1/PlanNode.java  | 1038 ++++++++-------
 .../google/spanner/v1/PlanNodeOrBuilder.java  |   17 +-
 .../java/com/google/spanner/v1/QueryPlan.java |  255 ++--
 .../google/spanner/v1/QueryPlanOrBuilder.java |    8 +-
 .../com/google/spanner/v1/QueryPlanProto.java |   12 +-
 .../com/google/spanner/v1/ReadRequest.java    |  208 +--
 .../spanner/v1/ReadRequestOrBuilder.java      |   18 +-
 .../com/google/spanner/v1/RequestOptions.java |    2 +-
 .../java/com/google/spanner/v1/ResultSet.java |  302 +++--
 .../google/spanner/v1/ResultSetMetadata.java  |  291 ++--
 .../v1/ResultSetMetadataOrBuilder.java        |    8 +-
 .../google/spanner/v1/ResultSetOrBuilder.java |    8 +-
 .../com/google/spanner/v1/ResultSetProto.java |   22 +-
 .../com/google/spanner/v1/ResultSetStats.java |  274 ++--
 .../spanner/v1/ResultSetStatsOrBuilder.java   |    6 +-
 .../google/spanner/v1/RollbackRequest.java    |  223 ++--
 .../spanner/v1/RollbackRequestOrBuilder.java  |    2 +-
 .../java/com/google/spanner/v1/Session.java   |  338 ++---
 .../google/spanner/v1/SessionOrBuilder.java   |   14 +-
 .../com/google/spanner/v1/SpannerProto.java   |  492 +++----
 .../com/google/spanner/v1/StructType.java     |  542 ++++----
 .../spanner/v1/StructTypeOrBuilder.java       |    9 +-
 .../com/google/spanner/v1/Transaction.java    |  185 +--
 .../google/spanner/v1/TransactionOptions.java | 1096 ++++++++-------
 .../v1/TransactionOptionsOrBuilder.java       |   14 +-
 .../google/spanner/v1/TransactionProto.java   |   14 +-
 .../spanner/v1/TransactionSelector.java       |  359 ++---
 .../v1/TransactionSelectorOrBuilder.java      |   10 +-
 .../main/java/com/google/spanner/v1/Type.java |  317 +++--
 .../java/com/google/spanner/v1/TypeCode.java  |   12 +-
 .../com/google/spanner/v1/TypeOrBuilder.java  |   10 +-
 .../java/com/google/spanner/v1/TypeProto.java |    8 +-
 79 files changed, 7210 insertions(+), 6028 deletions(-)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
index b43f8499b8..9d687bb516 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
@@ -769,8 +769,6 @@ ResultSet readInternalWithOptions(
     if (partitionToken != null) {
       builder.setPartitionToken(partitionToken);
     }
-    builder.setRequestOptions(buildRequestOptions(readOptions));
-
     final int prefetchChunks =
         readOptions.hasPrefetchChunks() ? readOptions.prefetchChunks() : defaultPrefetchChunks;
     ResumableStreamIterator stream =
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
index 401ade8045..3d443f3673 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
@@ -215,7 +215,6 @@ void appendToOptions(Options options) {
     }
   }
 
-
   private boolean withCommitStats;
   private Long limit;
   private Integer prefetchChunks;
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java
index 519364ba69..195dbb8225 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java
@@ -192,7 +192,8 @@ public void executeSqlRequestBuilderWithRequestOptions() {
             .getExecuteSqlRequestBuilder(
                 Statement.newBuilder("SELECT FOO FROM BAR").build(),
                 QueryMode.NORMAL,
-                Options.fromUpdateOptions(Options.tag("tag-1")), false)
+                Options.fromUpdateOptions(Options.tag("tag-1")),
+                false)
             .build();
     assertThat(request.getSql()).isEqualTo("SELECT FOO FROM BAR");
     assertThat(request.getRequestOptions().getRequestTag()).isEqualTo("tag-1");
@@ -217,7 +218,8 @@ public void executeSqlRequestBuilderWithRequestOptionsWithTxnTag() {
             .getExecuteSqlRequestBuilder(
                 Statement.newBuilder("SELECT FOO FROM BAR").build(),
                 QueryMode.NORMAL,
-                Options.fromUpdateOptions(Options.tag("tag-1")), false)
+                Options.fromUpdateOptions(Options.tag("tag-1")),
+                false)
             .build();
     assertThat(request.getSql()).isEqualTo("SELECT FOO FROM BAR");
     assertThat(request.getRequestOptions().getRequestTag()).isEqualTo("tag-1");
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
index 47aecca090..337510757d 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
@@ -1103,15 +1103,10 @@ public void testSessionNotFoundWriteAtLeastOnce() {
     when(closedSession.writeAtLeastOnceWithOptions(mutations)).thenThrow(sessionNotFound);
 
     final SessionImpl openSession = mockSession();
-<<<<<<< HEAD
     com.google.cloud.spanner.CommitResponse response =
         mock(com.google.cloud.spanner.CommitResponse.class);
     when(response.getCommitTimestamp()).thenReturn(Timestamp.now());
     when(openSession.writeAtLeastOnceWithOptions(mutations)).thenReturn(response);
-=======
-    when(openSession.writeAtLeastOnceWithOptions(mutations))
-        .thenReturn(new com.google.cloud.spanner.CommitResponse(Timestamp.now()));
->>>>>>> 33eb6e9c (fix: combine boiler plate code)
     doAnswer(
             new Answer() {
               @Override
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequest.java
index 00005feee3..cdca44bf67 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequest.java
@@ -41,13 +41,13 @@ private BatchCreateSessionsRequest() {
     database_ = "";
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new BatchCreateSessionsRequest();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private BatchCreateSessionsRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -72,18 +72,19 @@ private BatchCreateSessionsRequest(
             break;
           case 10:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               database_ = s;
               break;
             }
           case 18:
             {
-              Session.Builder subBuilder = null;
+              com.google.spanner.v1.Session.Builder subBuilder = null;
               if (sessionTemplate_ != null) {
                 subBuilder = sessionTemplate_.toBuilder();
               }
-              sessionTemplate_ = input.readMessage(Session.parser(), extensionRegistry);
+              sessionTemplate_ =
+                  input.readMessage(com.google.spanner.v1.Session.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(sessionTemplate_);
                 sessionTemplate_ = subBuilder.buildPartial();
@@ -116,18 +117,22 @@ private BatchCreateSessionsRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_BatchCreateSessionsRequest_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_BatchCreateSessionsRequest_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
         .internal_static_google_spanner_v1_BatchCreateSessionsRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(BatchCreateSessionsRequest.class, Builder.class);
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.BatchCreateSessionsRequest.class,
+            com.google.spanner.v1.BatchCreateSessionsRequest.Builder.class);
   }
 
   public static final int DATABASE_FIELD_NUMBER = 1;
-  private volatile Object database_;
+  private volatile java.lang.Object database_;
   /**
    *
    *
@@ -141,14 +146,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return The database.
    */
-  @Override
-  public String getDatabase() {
-    Object ref = database_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  public java.lang.String getDatabase() {
+    java.lang.Object ref = database_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       database_ = s;
       return s;
     }
@@ -166,11 +171,12 @@ public String getDatabase() {
    *
    * @return The bytes for database.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getDatabaseBytes() {
-    Object ref = database_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    java.lang.Object ref = database_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       database_ = b;
       return b;
     } else {
@@ -179,7 +185,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
   }
 
   public static final int SESSION_TEMPLATE_FIELD_NUMBER = 2;
-  private Session sessionTemplate_;
+  private com.google.spanner.v1.Session sessionTemplate_;
   /**
    *
    *
@@ -191,7 +197,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
    *
    * @return Whether the sessionTemplate field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasSessionTemplate() {
     return sessionTemplate_ != null;
   }
@@ -206,9 +212,11 @@ public boolean hasSessionTemplate() {
    *
    * @return The sessionTemplate.
    */
-  @Override
-  public Session getSessionTemplate() {
-    return sessionTemplate_ == null ? Session.getDefaultInstance() : sessionTemplate_;
+  @java.lang.Override
+  public com.google.spanner.v1.Session getSessionTemplate() {
+    return sessionTemplate_ == null
+        ? com.google.spanner.v1.Session.getDefaultInstance()
+        : sessionTemplate_;
   }
   /**
    *
@@ -219,8 +227,8 @@ public Session getSessionTemplate() {
    *
    * .google.spanner.v1.Session session_template = 2;
    */
-  @Override
-  public SessionOrBuilder getSessionTemplateOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.SessionOrBuilder getSessionTemplateOrBuilder() {
     return getSessionTemplate();
   }
 
@@ -241,14 +249,14 @@ public SessionOrBuilder getSessionTemplateOrBuilder() {
    *
    * @return The sessionCount.
    */
-  @Override
+  @java.lang.Override
   public int getSessionCount() {
     return sessionCount_;
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -258,7 +266,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, database_);
@@ -272,7 +280,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -292,15 +300,16 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof BatchCreateSessionsRequest)) {
+    if (!(obj instanceof com.google.spanner.v1.BatchCreateSessionsRequest)) {
       return super.equals(obj);
     }
-    BatchCreateSessionsRequest other = (BatchCreateSessionsRequest) obj;
+    com.google.spanner.v1.BatchCreateSessionsRequest other =
+        (com.google.spanner.v1.BatchCreateSessionsRequest) obj;
 
     if (!getDatabase().equals(other.getDatabase())) return false;
     if (hasSessionTemplate() != other.hasSessionTemplate()) return false;
@@ -312,7 +321,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -332,70 +341,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static BatchCreateSessionsRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static BatchCreateSessionsRequest parseFrom(
+  public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static BatchCreateSessionsRequest parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static BatchCreateSessionsRequest parseFrom(
+  public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static BatchCreateSessionsRequest parseFrom(byte[] data)
+  public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static BatchCreateSessionsRequest parseFrom(
+  public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static BatchCreateSessionsRequest parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static BatchCreateSessionsRequest parseFrom(
+  public static com.google.spanner.v1.BatchCreateSessionsRequest 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 BatchCreateSessionsRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.BatchCreateSessionsRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static BatchCreateSessionsRequest parseDelimitedFrom(
+  public static com.google.spanner.v1.BatchCreateSessionsRequest 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 BatchCreateSessionsRequest parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static BatchCreateSessionsRequest parseFrom(
+  public static com.google.spanner.v1.BatchCreateSessionsRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -403,7 +413,7 @@ public static BatchCreateSessionsRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -412,17 +422,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(BatchCreateSessionsRequest prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.BatchCreateSessionsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -438,16 +448,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.BatchCreateSessionsRequest)
-      BatchCreateSessionsRequestOrBuilder {
+      com.google.spanner.v1.BatchCreateSessionsRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_BatchCreateSessionsRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_BatchCreateSessionsRequest_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_BatchCreateSessionsRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(BatchCreateSessionsRequest.class, Builder.class);
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.BatchCreateSessionsRequest.class,
+              com.google.spanner.v1.BatchCreateSessionsRequest.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.BatchCreateSessionsRequest.newBuilder()
@@ -455,7 +469,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -464,7 +478,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -480,28 +494,30 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_BatchCreateSessionsRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_BatchCreateSessionsRequest_descriptor;
     }
 
-    @Override
-    public BatchCreateSessionsRequest getDefaultInstanceForType() {
-      return BatchCreateSessionsRequest.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.BatchCreateSessionsRequest getDefaultInstanceForType() {
+      return com.google.spanner.v1.BatchCreateSessionsRequest.getDefaultInstance();
     }
 
-    @Override
-    public BatchCreateSessionsRequest build() {
-      BatchCreateSessionsRequest result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.BatchCreateSessionsRequest build() {
+      com.google.spanner.v1.BatchCreateSessionsRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public BatchCreateSessionsRequest buildPartial() {
-      BatchCreateSessionsRequest result = new BatchCreateSessionsRequest(this);
+    @java.lang.Override
+    public com.google.spanner.v1.BatchCreateSessionsRequest buildPartial() {
+      com.google.spanner.v1.BatchCreateSessionsRequest result =
+          new com.google.spanner.v1.BatchCreateSessionsRequest(this);
       result.database_ = database_;
       if (sessionTemplateBuilder_ == null) {
         result.sessionTemplate_ = sessionTemplate_;
@@ -513,50 +529,52 @@ public BatchCreateSessionsRequest buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof BatchCreateSessionsRequest) {
-        return mergeFrom((BatchCreateSessionsRequest) other);
+      if (other instanceof com.google.spanner.v1.BatchCreateSessionsRequest) {
+        return mergeFrom((com.google.spanner.v1.BatchCreateSessionsRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(BatchCreateSessionsRequest other) {
-      if (other == BatchCreateSessionsRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.BatchCreateSessionsRequest other) {
+      if (other == com.google.spanner.v1.BatchCreateSessionsRequest.getDefaultInstance())
+        return this;
       if (!other.getDatabase().isEmpty()) {
         database_ = other.database_;
         onChanged();
@@ -572,21 +590,21 @@ public Builder mergeFrom(BatchCreateSessionsRequest other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      BatchCreateSessionsRequest parsedMessage = null;
+      com.google.spanner.v1.BatchCreateSessionsRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (BatchCreateSessionsRequest) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.BatchCreateSessionsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -596,7 +614,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private Object database_ = "";
+    private java.lang.Object database_ = "";
     /**
      *
      *
@@ -610,15 +628,15 @@ public Builder mergeFrom(
      *
      * @return The database.
      */
-    public String getDatabase() {
-      Object ref = database_;
-      if (!(ref instanceof String)) {
+    public java.lang.String getDatabase() {
+      java.lang.Object ref = database_;
+      if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         database_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -635,10 +653,10 @@ public String getDatabase() {
      * @return The bytes for database.
      */
     public com.google.protobuf.ByteString getDatabaseBytes() {
-      Object ref = database_;
+      java.lang.Object ref = database_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         database_ = b;
         return b;
       } else {
@@ -659,7 +677,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
      * @param value The database to set.
      * @return This builder for chaining.
      */
-    public Builder setDatabase(String value) {
+    public Builder setDatabase(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -712,8 +730,11 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private Session sessionTemplate_;
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.spanner.v1.Session sessionTemplate_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Session,
+            com.google.spanner.v1.Session.Builder,
+            com.google.spanner.v1.SessionOrBuilder>
         sessionTemplateBuilder_;
     /**
      *
@@ -740,9 +761,11 @@ public boolean hasSessionTemplate() {
      *
      * @return The sessionTemplate.
      */
-    public Session getSessionTemplate() {
+    public com.google.spanner.v1.Session getSessionTemplate() {
       if (sessionTemplateBuilder_ == null) {
-        return sessionTemplate_ == null ? Session.getDefaultInstance() : sessionTemplate_;
+        return sessionTemplate_ == null
+            ? com.google.spanner.v1.Session.getDefaultInstance()
+            : sessionTemplate_;
       } else {
         return sessionTemplateBuilder_.getMessage();
       }
@@ -756,7 +779,7 @@ public Session getSessionTemplate() {
      *
      * .google.spanner.v1.Session session_template = 2;
      */
-    public Builder setSessionTemplate(Session value) {
+    public Builder setSessionTemplate(com.google.spanner.v1.Session value) {
       if (sessionTemplateBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -778,7 +801,7 @@ public Builder setSessionTemplate(Session value) {
      *
      * .google.spanner.v1.Session session_template = 2;
      */
-    public Builder setSessionTemplate(Session.Builder builderForValue) {
+    public Builder setSessionTemplate(com.google.spanner.v1.Session.Builder builderForValue) {
       if (sessionTemplateBuilder_ == null) {
         sessionTemplate_ = builderForValue.build();
         onChanged();
@@ -797,10 +820,13 @@ public Builder setSessionTemplate(Session.Builder builderForValue) {
      *
      * .google.spanner.v1.Session session_template = 2;
      */
-    public Builder mergeSessionTemplate(Session value) {
+    public Builder mergeSessionTemplate(com.google.spanner.v1.Session value) {
       if (sessionTemplateBuilder_ == null) {
         if (sessionTemplate_ != null) {
-          sessionTemplate_ = Session.newBuilder(sessionTemplate_).mergeFrom(value).buildPartial();
+          sessionTemplate_ =
+              com.google.spanner.v1.Session.newBuilder(sessionTemplate_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           sessionTemplate_ = value;
         }
@@ -840,7 +866,7 @@ public Builder clearSessionTemplate() {
      *
      * .google.spanner.v1.Session session_template = 2;
      */
-    public Session.Builder getSessionTemplateBuilder() {
+    public com.google.spanner.v1.Session.Builder getSessionTemplateBuilder() {
 
       onChanged();
       return getSessionTemplateFieldBuilder().getBuilder();
@@ -854,11 +880,13 @@ public Session.Builder getSessionTemplateBuilder() {
      *
      * .google.spanner.v1.Session session_template = 2;
      */
-    public SessionOrBuilder getSessionTemplateOrBuilder() {
+    public com.google.spanner.v1.SessionOrBuilder getSessionTemplateOrBuilder() {
       if (sessionTemplateBuilder_ != null) {
         return sessionTemplateBuilder_.getMessageOrBuilder();
       } else {
-        return sessionTemplate_ == null ? Session.getDefaultInstance() : sessionTemplate_;
+        return sessionTemplate_ == null
+            ? com.google.spanner.v1.Session.getDefaultInstance()
+            : sessionTemplate_;
       }
     }
     /**
@@ -870,12 +898,17 @@ public SessionOrBuilder getSessionTemplateOrBuilder() {
      *
      * .google.spanner.v1.Session session_template = 2;
      */
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Session,
+            com.google.spanner.v1.Session.Builder,
+            com.google.spanner.v1.SessionOrBuilder>
         getSessionTemplateFieldBuilder() {
       if (sessionTemplateBuilder_ == null) {
         sessionTemplateBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                Session, Session.Builder, SessionOrBuilder>(
+                com.google.spanner.v1.Session,
+                com.google.spanner.v1.Session.Builder,
+                com.google.spanner.v1.SessionOrBuilder>(
                 getSessionTemplate(), getParentForChildren(), isClean());
         sessionTemplate_ = null;
       }
@@ -898,7 +931,7 @@ public SessionOrBuilder getSessionTemplateOrBuilder() {
      *
      * @return The sessionCount.
      */
-    @Override
+    @java.lang.Override
     public int getSessionCount() {
       return sessionCount_;
     }
@@ -946,12 +979,12 @@ public Builder clearSessionCount() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -961,19 +994,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.BatchCreateSessionsRequest)
-  private static final BatchCreateSessionsRequest DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.BatchCreateSessionsRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new BatchCreateSessionsRequest();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.BatchCreateSessionsRequest();
   }
 
-  public static BatchCreateSessionsRequest getDefaultInstance() {
+  public static com.google.spanner.v1.BatchCreateSessionsRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public BatchCreateSessionsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -986,13 +1019,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public BatchCreateSessionsRequest getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.BatchCreateSessionsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequestOrBuilder.java
index 0ebd6d8b7c..3a4cd4d26a 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface BatchCreateSessionsRequestOrBuilder
    *
    * @return The database.
    */
-  String getDatabase();
+  java.lang.String getDatabase();
   /**
    *
    *
@@ -75,7 +75,7 @@ public interface BatchCreateSessionsRequestOrBuilder
    *
    * @return The sessionTemplate.
    */
-  Session getSessionTemplate();
+  com.google.spanner.v1.Session getSessionTemplate();
   /**
    *
    *
@@ -85,7 +85,7 @@ public interface BatchCreateSessionsRequestOrBuilder
    *
    * .google.spanner.v1.Session session_template = 2;
    */
-  SessionOrBuilder getSessionTemplateOrBuilder();
+  com.google.spanner.v1.SessionOrBuilder getSessionTemplateOrBuilder();
 
   /**
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponse.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponse.java
index 7b4cc06412..76704fd06e 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponse.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponse.java
@@ -41,13 +41,13 @@ private BatchCreateSessionsResponse() {
     session_ = java.util.Collections.emptyList();
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new BatchCreateSessionsResponse();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private BatchCreateSessionsResponse(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -74,10 +74,11 @@ private BatchCreateSessionsResponse(
           case 10:
             {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                session_ = new java.util.ArrayList();
+                session_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              session_.add(input.readMessage(Session.parser(), extensionRegistry));
+              session_.add(
+                  input.readMessage(com.google.spanner.v1.Session.parser(), extensionRegistry));
               break;
             }
           default:
@@ -103,18 +104,22 @@ private BatchCreateSessionsResponse(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_BatchCreateSessionsResponse_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_BatchCreateSessionsResponse_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
         .internal_static_google_spanner_v1_BatchCreateSessionsResponse_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(BatchCreateSessionsResponse.class, Builder.class);
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.BatchCreateSessionsResponse.class,
+            com.google.spanner.v1.BatchCreateSessionsResponse.Builder.class);
   }
 
   public static final int SESSION_FIELD_NUMBER = 1;
-  private java.util.List session_;
+  private java.util.List session_;
   /**
    *
    *
@@ -124,8 +129,8 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * repeated .google.spanner.v1.Session session = 1;
    */
-  @Override
-  public java.util.List getSessionList() {
+  @java.lang.Override
+  public java.util.List getSessionList() {
     return session_;
   }
   /**
@@ -137,8 +142,9 @@ public java.util.List getSessionList() {
    *
    * repeated .google.spanner.v1.Session session = 1;
    */
-  @Override
-  public java.util.List getSessionOrBuilderList() {
+  @java.lang.Override
+  public java.util.List
+      getSessionOrBuilderList() {
     return session_;
   }
   /**
@@ -150,7 +156,7 @@ public java.util.List getSessionOrBuilderList() {
    *
    * repeated .google.spanner.v1.Session session = 1;
    */
-  @Override
+  @java.lang.Override
   public int getSessionCount() {
     return session_.size();
   }
@@ -163,8 +169,8 @@ public int getSessionCount() {
    *
    * repeated .google.spanner.v1.Session session = 1;
    */
-  @Override
-  public Session getSession(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.Session getSession(int index) {
     return session_.get(index);
   }
   /**
@@ -176,14 +182,14 @@ public Session getSession(int index) {
    *
    * repeated .google.spanner.v1.Session session = 1;
    */
-  @Override
-  public SessionOrBuilder getSessionOrBuilder(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder(int index) {
     return session_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -193,7 +199,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < session_.size(); i++) {
       output.writeMessage(1, session_.get(i));
@@ -201,7 +207,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -215,22 +221,23 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof BatchCreateSessionsResponse)) {
+    if (!(obj instanceof com.google.spanner.v1.BatchCreateSessionsResponse)) {
       return super.equals(obj);
     }
-    BatchCreateSessionsResponse other = (BatchCreateSessionsResponse) obj;
+    com.google.spanner.v1.BatchCreateSessionsResponse other =
+        (com.google.spanner.v1.BatchCreateSessionsResponse) obj;
 
     if (!getSessionList().equals(other.getSessionList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -246,70 +253,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static BatchCreateSessionsResponse parseFrom(java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
+  public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom(
+      java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static BatchCreateSessionsResponse parseFrom(
+  public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static BatchCreateSessionsResponse parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static BatchCreateSessionsResponse parseFrom(
+  public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static BatchCreateSessionsResponse parseFrom(byte[] data)
+  public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static BatchCreateSessionsResponse parseFrom(
+  public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static BatchCreateSessionsResponse parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static BatchCreateSessionsResponse parseFrom(
+  public static com.google.spanner.v1.BatchCreateSessionsResponse 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 BatchCreateSessionsResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.BatchCreateSessionsResponse parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static BatchCreateSessionsResponse parseDelimitedFrom(
+  public static com.google.spanner.v1.BatchCreateSessionsResponse 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 BatchCreateSessionsResponse parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static BatchCreateSessionsResponse parseFrom(
+  public static com.google.spanner.v1.BatchCreateSessionsResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -317,7 +325,7 @@ public static BatchCreateSessionsResponse parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -326,17 +334,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(BatchCreateSessionsResponse prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.BatchCreateSessionsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -352,16 +360,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.BatchCreateSessionsResponse)
-      BatchCreateSessionsResponseOrBuilder {
+      com.google.spanner.v1.BatchCreateSessionsResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_BatchCreateSessionsResponse_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_BatchCreateSessionsResponse_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_BatchCreateSessionsResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(BatchCreateSessionsResponse.class, Builder.class);
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.BatchCreateSessionsResponse.class,
+              com.google.spanner.v1.BatchCreateSessionsResponse.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.BatchCreateSessionsResponse.newBuilder()
@@ -369,7 +381,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -380,7 +392,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (sessionBuilder_ == null) {
@@ -392,28 +404,30 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_BatchCreateSessionsResponse_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_BatchCreateSessionsResponse_descriptor;
     }
 
-    @Override
-    public BatchCreateSessionsResponse getDefaultInstanceForType() {
-      return BatchCreateSessionsResponse.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.BatchCreateSessionsResponse getDefaultInstanceForType() {
+      return com.google.spanner.v1.BatchCreateSessionsResponse.getDefaultInstance();
     }
 
-    @Override
-    public BatchCreateSessionsResponse build() {
-      BatchCreateSessionsResponse result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.BatchCreateSessionsResponse build() {
+      com.google.spanner.v1.BatchCreateSessionsResponse result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public BatchCreateSessionsResponse buildPartial() {
-      BatchCreateSessionsResponse result = new BatchCreateSessionsResponse(this);
+    @java.lang.Override
+    public com.google.spanner.v1.BatchCreateSessionsResponse buildPartial() {
+      com.google.spanner.v1.BatchCreateSessionsResponse result =
+          new com.google.spanner.v1.BatchCreateSessionsResponse(this);
       int from_bitField0_ = bitField0_;
       if (sessionBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -428,50 +442,52 @@ public BatchCreateSessionsResponse buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof BatchCreateSessionsResponse) {
-        return mergeFrom((BatchCreateSessionsResponse) other);
+      if (other instanceof com.google.spanner.v1.BatchCreateSessionsResponse) {
+        return mergeFrom((com.google.spanner.v1.BatchCreateSessionsResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(BatchCreateSessionsResponse other) {
-      if (other == BatchCreateSessionsResponse.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.BatchCreateSessionsResponse other) {
+      if (other == com.google.spanner.v1.BatchCreateSessionsResponse.getDefaultInstance())
+        return this;
       if (sessionBuilder_ == null) {
         if (!other.session_.isEmpty()) {
           if (session_.isEmpty()) {
@@ -504,21 +520,22 @@ public Builder mergeFrom(BatchCreateSessionsResponse other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      BatchCreateSessionsResponse parsedMessage = null;
+      com.google.spanner.v1.BatchCreateSessionsResponse parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (BatchCreateSessionsResponse) e.getUnfinishedMessage();
+        parsedMessage =
+            (com.google.spanner.v1.BatchCreateSessionsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -530,16 +547,20 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.util.List session_ = java.util.Collections.emptyList();
+    private java.util.List session_ =
+        java.util.Collections.emptyList();
 
     private void ensureSessionIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        session_ = new java.util.ArrayList(session_);
+        session_ = new java.util.ArrayList(session_);
         bitField0_ |= 0x00000001;
       }
     }
 
-    private com.google.protobuf.RepeatedFieldBuilderV3
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.spanner.v1.Session,
+            com.google.spanner.v1.Session.Builder,
+            com.google.spanner.v1.SessionOrBuilder>
         sessionBuilder_;
 
     /**
@@ -551,7 +572,7 @@ private void ensureSessionIsMutable() {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public java.util.List getSessionList() {
+    public java.util.List getSessionList() {
       if (sessionBuilder_ == null) {
         return java.util.Collections.unmodifiableList(session_);
       } else {
@@ -583,7 +604,7 @@ public int getSessionCount() {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public Session getSession(int index) {
+    public com.google.spanner.v1.Session getSession(int index) {
       if (sessionBuilder_ == null) {
         return session_.get(index);
       } else {
@@ -599,7 +620,7 @@ public Session getSession(int index) {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public Builder setSession(int index, Session value) {
+    public Builder setSession(int index, com.google.spanner.v1.Session value) {
       if (sessionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -621,7 +642,7 @@ public Builder setSession(int index, Session value) {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public Builder setSession(int index, Session.Builder builderForValue) {
+    public Builder setSession(int index, com.google.spanner.v1.Session.Builder builderForValue) {
       if (sessionBuilder_ == null) {
         ensureSessionIsMutable();
         session_.set(index, builderForValue.build());
@@ -640,7 +661,7 @@ public Builder setSession(int index, Session.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public Builder addSession(Session value) {
+    public Builder addSession(com.google.spanner.v1.Session value) {
       if (sessionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -662,7 +683,7 @@ public Builder addSession(Session value) {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public Builder addSession(int index, Session value) {
+    public Builder addSession(int index, com.google.spanner.v1.Session value) {
       if (sessionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -684,7 +705,7 @@ public Builder addSession(int index, Session value) {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public Builder addSession(Session.Builder builderForValue) {
+    public Builder addSession(com.google.spanner.v1.Session.Builder builderForValue) {
       if (sessionBuilder_ == null) {
         ensureSessionIsMutable();
         session_.add(builderForValue.build());
@@ -703,7 +724,7 @@ public Builder addSession(Session.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public Builder addSession(int index, Session.Builder builderForValue) {
+    public Builder addSession(int index, com.google.spanner.v1.Session.Builder builderForValue) {
       if (sessionBuilder_ == null) {
         ensureSessionIsMutable();
         session_.add(index, builderForValue.build());
@@ -722,7 +743,8 @@ public Builder addSession(int index, Session.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public Builder addAllSession(Iterable values) {
+    public Builder addAllSession(
+        java.lang.Iterable values) {
       if (sessionBuilder_ == null) {
         ensureSessionIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, session_);
@@ -779,7 +801,7 @@ public Builder removeSession(int index) {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public Session.Builder getSessionBuilder(int index) {
+    public com.google.spanner.v1.Session.Builder getSessionBuilder(int index) {
       return getSessionFieldBuilder().getBuilder(index);
     }
     /**
@@ -791,7 +813,7 @@ public Session.Builder getSessionBuilder(int index) {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public SessionOrBuilder getSessionOrBuilder(int index) {
+    public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder(int index) {
       if (sessionBuilder_ == null) {
         return session_.get(index);
       } else {
@@ -807,7 +829,8 @@ public SessionOrBuilder getSessionOrBuilder(int index) {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public java.util.List getSessionOrBuilderList() {
+    public java.util.List
+        getSessionOrBuilderList() {
       if (sessionBuilder_ != null) {
         return sessionBuilder_.getMessageOrBuilderList();
       } else {
@@ -823,8 +846,9 @@ public java.util.List getSessionOrBuilderList() {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public Session.Builder addSessionBuilder() {
-      return getSessionFieldBuilder().addBuilder(Session.getDefaultInstance());
+    public com.google.spanner.v1.Session.Builder addSessionBuilder() {
+      return getSessionFieldBuilder()
+          .addBuilder(com.google.spanner.v1.Session.getDefaultInstance());
     }
     /**
      *
@@ -835,8 +859,9 @@ public Session.Builder addSessionBuilder() {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public Session.Builder addSessionBuilder(int index) {
-      return getSessionFieldBuilder().addBuilder(index, Session.getDefaultInstance());
+    public com.google.spanner.v1.Session.Builder addSessionBuilder(int index) {
+      return getSessionFieldBuilder()
+          .addBuilder(index, com.google.spanner.v1.Session.getDefaultInstance());
     }
     /**
      *
@@ -847,28 +872,33 @@ public Session.Builder addSessionBuilder(int index) {
      *
      * repeated .google.spanner.v1.Session session = 1;
      */
-    public java.util.List getSessionBuilderList() {
+    public java.util.List getSessionBuilderList() {
       return getSessionFieldBuilder().getBuilderList();
     }
 
-    private com.google.protobuf.RepeatedFieldBuilderV3
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.spanner.v1.Session,
+            com.google.spanner.v1.Session.Builder,
+            com.google.spanner.v1.SessionOrBuilder>
         getSessionFieldBuilder() {
       if (sessionBuilder_ == null) {
         sessionBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
-                Session, Session.Builder, SessionOrBuilder>(
+                com.google.spanner.v1.Session,
+                com.google.spanner.v1.Session.Builder,
+                com.google.spanner.v1.SessionOrBuilder>(
                 session_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         session_ = null;
       }
       return sessionBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -878,19 +908,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.BatchCreateSessionsResponse)
-  private static final BatchCreateSessionsResponse DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.BatchCreateSessionsResponse DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new BatchCreateSessionsResponse();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.BatchCreateSessionsResponse();
   }
 
-  public static BatchCreateSessionsResponse getDefaultInstance() {
+  public static com.google.spanner.v1.BatchCreateSessionsResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public BatchCreateSessionsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -903,13 +933,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public BatchCreateSessionsResponse getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.BatchCreateSessionsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponseOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponseOrBuilder.java
index 2b94fe2a53..8c6fd582b7 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponseOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BatchCreateSessionsResponseOrBuilder.java
@@ -32,7 +32,7 @@ public interface BatchCreateSessionsResponseOrBuilder
    *
    * repeated .google.spanner.v1.Session session = 1;
    */
-  java.util.List getSessionList();
+  java.util.List getSessionList();
   /**
    *
    *
@@ -42,7 +42,7 @@ public interface BatchCreateSessionsResponseOrBuilder
    *
    * repeated .google.spanner.v1.Session session = 1;
    */
-  Session getSession(int index);
+  com.google.spanner.v1.Session getSession(int index);
   /**
    *
    *
@@ -62,7 +62,7 @@ public interface BatchCreateSessionsResponseOrBuilder
    *
    * repeated .google.spanner.v1.Session session = 1;
    */
-  java.util.List getSessionOrBuilderList();
+  java.util.List getSessionOrBuilderList();
   /**
    *
    *
@@ -72,5 +72,5 @@ public interface BatchCreateSessionsResponseOrBuilder
    *
    * repeated .google.spanner.v1.Session session = 1;
    */
-  SessionOrBuilder getSessionOrBuilder(int index);
+  com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder(int index);
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java
index 51c2440329..e2e7d1e489 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java
@@ -71,51 +71,51 @@ private BeginTransactionRequest(
             done = true;
             break;
           case 10:
-          {
-            java.lang.String s = input.readStringRequireUtf8();
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            session_ = s;
-            break;
-          }
-          case 18:
-          {
-            com.google.spanner.v1.TransactionOptions.Builder subBuilder = null;
-            if (options_ != null) {
-              subBuilder = options_.toBuilder();
+              session_ = s;
+              break;
             }
-            options_ =
-                input.readMessage(
-                    com.google.spanner.v1.TransactionOptions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(options_);
-              options_ = subBuilder.buildPartial();
+          case 18:
+            {
+              com.google.spanner.v1.TransactionOptions.Builder subBuilder = null;
+              if (options_ != null) {
+                subBuilder = options_.toBuilder();
+              }
+              options_ =
+                  input.readMessage(
+                      com.google.spanner.v1.TransactionOptions.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(options_);
+                options_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-
-            break;
-          }
           case 26:
-          {
-            com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
-            if (requestOptions_ != null) {
-              subBuilder = requestOptions_.toBuilder();
+            {
+              com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
+              if (requestOptions_ != null) {
+                subBuilder = requestOptions_.toBuilder();
+              }
+              requestOptions_ =
+                  input.readMessage(
+                      com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(requestOptions_);
+                requestOptions_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-            requestOptions_ =
-                input.readMessage(
-                    com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(requestOptions_);
-              requestOptions_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
           default:
-          {
-            if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -135,7 +135,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-  internalGetFieldAccessorTable() {
+      internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto
         .internal_static_google_spanner_v1_BeginTransactionRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
@@ -517,7 +517,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internalGetFieldAccessorTable() {
+        internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_BeginTransactionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -800,9 +800,9 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
 
     private com.google.spanner.v1.TransactionOptions options_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.TransactionOptions,
-        com.google.spanner.v1.TransactionOptions.Builder,
-        com.google.spanner.v1.TransactionOptionsOrBuilder>
+            com.google.spanner.v1.TransactionOptions,
+            com.google.spanner.v1.TransactionOptions.Builder,
+            com.google.spanner.v1.TransactionOptionsOrBuilder>
         optionsBuilder_;
     /**
      *
@@ -985,10 +985,10 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getOptionsOrBuilder() {
      * 
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.TransactionOptions,
-        com.google.spanner.v1.TransactionOptions.Builder,
-        com.google.spanner.v1.TransactionOptionsOrBuilder>
-    getOptionsFieldBuilder() {
+            com.google.spanner.v1.TransactionOptions,
+            com.google.spanner.v1.TransactionOptions.Builder,
+            com.google.spanner.v1.TransactionOptionsOrBuilder>
+        getOptionsFieldBuilder() {
       if (optionsBuilder_ == null) {
         optionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -1003,9 +1003,9 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getOptionsOrBuilder() {
 
     private com.google.spanner.v1.RequestOptions requestOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.RequestOptions,
-        com.google.spanner.v1.RequestOptions.Builder,
-        com.google.spanner.v1.RequestOptionsOrBuilder>
+            com.google.spanner.v1.RequestOptions,
+            com.google.spanner.v1.RequestOptions.Builder,
+            com.google.spanner.v1.RequestOptionsOrBuilder>
         requestOptionsBuilder_;
     /**
      *
@@ -1206,10 +1206,10 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder(
      * .google.spanner.v1.RequestOptions request_options = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.RequestOptions,
-        com.google.spanner.v1.RequestOptions.Builder,
-        com.google.spanner.v1.RequestOptionsOrBuilder>
-    getRequestOptionsFieldBuilder() {
+            com.google.spanner.v1.RequestOptions,
+            com.google.spanner.v1.RequestOptions.Builder,
+            com.google.spanner.v1.RequestOptionsOrBuilder>
+        getRequestOptionsFieldBuilder() {
       if (requestOptionsBuilder_ == null) {
         requestOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -1271,4 +1271,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.spanner.v1.BeginTransactionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-}
\ No newline at end of file
+}
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequestOrBuilder.java
index ea9769a3ea..61c73dbe37 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface BeginTransactionRequestOrBuilder
    *
    * @return The session.
    */
-  String getSession();
+  java.lang.String getSession();
   /**
    *
    *
@@ -79,7 +79,7 @@ public interface BeginTransactionRequestOrBuilder
    *
    * @return The options.
    */
-  TransactionOptions getOptions();
+  com.google.spanner.v1.TransactionOptions getOptions();
   /**
    *
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java
index bcd2dae389..922cab734e 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java
@@ -73,72 +73,72 @@ private CommitRequest(
             done = true;
             break;
           case 10:
-          {
-            java.lang.String s = input.readStringRequireUtf8();
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            session_ = s;
-            break;
-          }
+              session_ = s;
+              break;
+            }
           case 18:
-          {
-            transactionCase_ = 2;
-            transaction_ = input.readBytes();
-            break;
-          }
-          case 26:
-          {
-            com.google.spanner.v1.TransactionOptions.Builder subBuilder = null;
-            if (transactionCase_ == 3) {
-              subBuilder = ((com.google.spanner.v1.TransactionOptions) transaction_).toBuilder();
+            {
+              transactionCase_ = 2;
+              transaction_ = input.readBytes();
+              break;
             }
-            transaction_ =
-                input.readMessage(
-                    com.google.spanner.v1.TransactionOptions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.spanner.v1.TransactionOptions) transaction_);
-              transaction_ = subBuilder.buildPartial();
+          case 26:
+            {
+              com.google.spanner.v1.TransactionOptions.Builder subBuilder = null;
+              if (transactionCase_ == 3) {
+                subBuilder = ((com.google.spanner.v1.TransactionOptions) transaction_).toBuilder();
+              }
+              transaction_ =
+                  input.readMessage(
+                      com.google.spanner.v1.TransactionOptions.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.spanner.v1.TransactionOptions) transaction_);
+                transaction_ = subBuilder.buildPartial();
+              }
+              transactionCase_ = 3;
+              break;
             }
-            transactionCase_ = 3;
-            break;
-          }
           case 34:
-          {
-            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-              mutations_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                mutations_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              mutations_.add(
+                  input.readMessage(com.google.spanner.v1.Mutation.parser(), extensionRegistry));
+              break;
             }
-            mutations_.add(
-                input.readMessage(com.google.spanner.v1.Mutation.parser(), extensionRegistry));
-            break;
-          }
           case 40:
-          {
-            returnCommitStats_ = input.readBool();
-            break;
-          }
-          case 50:
-          {
-            com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
-            if (requestOptions_ != null) {
-              subBuilder = requestOptions_.toBuilder();
+            {
+              returnCommitStats_ = input.readBool();
+              break;
             }
-            requestOptions_ =
-                input.readMessage(
-                    com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(requestOptions_);
-              requestOptions_ = subBuilder.buildPartial();
+          case 50:
+            {
+              com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
+              if (requestOptions_ != null) {
+                subBuilder = requestOptions_.toBuilder();
+              }
+              requestOptions_ =
+                  input.readMessage(
+                      com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(requestOptions_);
+                requestOptions_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-
-            break;
-          }
           default:
-          {
-            if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -161,7 +161,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-  internalGetFieldAccessorTable() {
+      internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto
         .internal_static_google_spanner_v1_CommitRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
@@ -174,8 +174,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   public enum TransactionCase
       implements
-      com.google.protobuf.Internal.EnumLite,
-      com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     TRANSACTION_ID(2),
     SINGLE_USE_TRANSACTION(3),
     TRANSACTION_NOT_SET(0);
@@ -409,7 +409,7 @@ public java.util.List getMutationsList() {
    */
   @java.lang.Override
   public java.util.List
-  getMutationsOrBuilderList() {
+      getMutationsOrBuilderList() {
     return mutations_;
   }
   /**
@@ -776,7 +776,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internalGetFieldAccessorTable() {
+        internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_CommitRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -963,19 +963,19 @@ public Builder mergeFrom(com.google.spanner.v1.CommitRequest other) {
       }
       switch (other.getTransactionCase()) {
         case TRANSACTION_ID:
-        {
-          setTransactionId(other.getTransactionId());
-          break;
-        }
+          {
+            setTransactionId(other.getTransactionId());
+            break;
+          }
         case SINGLE_USE_TRANSACTION:
-        {
-          mergeSingleUseTransaction(other.getSingleUseTransaction());
-          break;
-        }
+          {
+            mergeSingleUseTransaction(other.getSingleUseTransaction());
+            break;
+          }
         case TRANSACTION_NOT_SET:
-        {
-          break;
-        }
+          {
+            break;
+          }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -1211,9 +1211,9 @@ public Builder clearTransactionId() {
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.TransactionOptions,
-        com.google.spanner.v1.TransactionOptions.Builder,
-        com.google.spanner.v1.TransactionOptionsOrBuilder>
+            com.google.spanner.v1.TransactionOptions,
+            com.google.spanner.v1.TransactionOptions.Builder,
+            com.google.spanner.v1.TransactionOptionsOrBuilder>
         singleUseTransactionBuilder_;
     /**
      *
@@ -1352,7 +1352,7 @@ public Builder mergeSingleUseTransaction(com.google.spanner.v1.TransactionOption
             && transaction_ != com.google.spanner.v1.TransactionOptions.getDefaultInstance()) {
           transaction_ =
               com.google.spanner.v1.TransactionOptions.newBuilder(
-                  (com.google.spanner.v1.TransactionOptions) transaction_)
+                      (com.google.spanner.v1.TransactionOptions) transaction_)
                   .mergeFrom(value)
                   .buildPartial();
         } else {
@@ -1467,10 +1467,10 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getSingleUseTransaction
      * .google.spanner.v1.TransactionOptions single_use_transaction = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.TransactionOptions,
-        com.google.spanner.v1.TransactionOptions.Builder,
-        com.google.spanner.v1.TransactionOptionsOrBuilder>
-    getSingleUseTransactionFieldBuilder() {
+            com.google.spanner.v1.TransactionOptions,
+            com.google.spanner.v1.TransactionOptions.Builder,
+            com.google.spanner.v1.TransactionOptionsOrBuilder>
+        getSingleUseTransactionFieldBuilder() {
       if (singleUseTransactionBuilder_ == null) {
         if (!(transactionCase_ == 3)) {
           transaction_ = com.google.spanner.v1.TransactionOptions.getDefaultInstance();
@@ -1502,9 +1502,9 @@ private void ensureMutationsIsMutable() {
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.spanner.v1.Mutation,
-        com.google.spanner.v1.Mutation.Builder,
-        com.google.spanner.v1.MutationOrBuilder>
+            com.google.spanner.v1.Mutation,
+            com.google.spanner.v1.Mutation.Builder,
+            com.google.spanner.v1.MutationOrBuilder>
         mutationsBuilder_;
 
     /**
@@ -1804,7 +1804,7 @@ public com.google.spanner.v1.MutationOrBuilder getMutationsOrBuilder(int index)
      * repeated .google.spanner.v1.Mutation mutations = 4;
      */
     public java.util.List
-    getMutationsOrBuilderList() {
+        getMutationsOrBuilderList() {
       if (mutationsBuilder_ != null) {
         return mutationsBuilder_.getMessageOrBuilderList();
       } else {
@@ -1857,10 +1857,10 @@ public java.util.List getMutationsBuilde
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.spanner.v1.Mutation,
-        com.google.spanner.v1.Mutation.Builder,
-        com.google.spanner.v1.MutationOrBuilder>
-    getMutationsFieldBuilder() {
+            com.google.spanner.v1.Mutation,
+            com.google.spanner.v1.Mutation.Builder,
+            com.google.spanner.v1.MutationOrBuilder>
+        getMutationsFieldBuilder() {
       if (mutationsBuilder_ == null) {
         mutationsBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -1933,9 +1933,9 @@ public Builder clearReturnCommitStats() {
 
     private com.google.spanner.v1.RequestOptions requestOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.RequestOptions,
-        com.google.spanner.v1.RequestOptions.Builder,
-        com.google.spanner.v1.RequestOptionsOrBuilder>
+            com.google.spanner.v1.RequestOptions,
+            com.google.spanner.v1.RequestOptions.Builder,
+            com.google.spanner.v1.RequestOptionsOrBuilder>
         requestOptionsBuilder_;
     /**
      *
@@ -2100,10 +2100,10 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder(
      * .google.spanner.v1.RequestOptions request_options = 6;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.RequestOptions,
-        com.google.spanner.v1.RequestOptions.Builder,
-        com.google.spanner.v1.RequestOptionsOrBuilder>
-    getRequestOptionsFieldBuilder() {
+            com.google.spanner.v1.RequestOptions,
+            com.google.spanner.v1.RequestOptions.Builder,
+            com.google.spanner.v1.RequestOptionsOrBuilder>
+        getRequestOptionsFieldBuilder() {
       if (requestOptionsBuilder_ == null) {
         requestOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -2165,4 +2165,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.spanner.v1.CommitRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-}
\ No newline at end of file
+}
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequestOrBuilder.java
index c589daff09..67704563b2 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface CommitRequestOrBuilder
    *
    * @return The session.
    */
-  String getSession();
+  java.lang.String getSession();
   /**
    *
    *
@@ -116,7 +116,7 @@ public interface CommitRequestOrBuilder
    *
    * @return The singleUseTransaction.
    */
-  TransactionOptions getSingleUseTransaction();
+  com.google.spanner.v1.TransactionOptions getSingleUseTransaction();
   /**
    *
    *
@@ -134,7 +134,7 @@ public interface CommitRequestOrBuilder
    *
    * .google.spanner.v1.TransactionOptions single_use_transaction = 3;
    */
-  TransactionOptionsOrBuilder getSingleUseTransactionOrBuilder();
+  com.google.spanner.v1.TransactionOptionsOrBuilder getSingleUseTransactionOrBuilder();
 
   /**
    *
@@ -147,7 +147,7 @@ public interface CommitRequestOrBuilder
    *
    * repeated .google.spanner.v1.Mutation mutations = 4;
    */
-  java.util.List getMutationsList();
+  java.util.List getMutationsList();
   /**
    *
    *
@@ -159,7 +159,7 @@ public interface CommitRequestOrBuilder
    *
    * repeated .google.spanner.v1.Mutation mutations = 4;
    */
-  Mutation getMutations(int index);
+  com.google.spanner.v1.Mutation getMutations(int index);
   /**
    *
    *
@@ -183,7 +183,7 @@ public interface CommitRequestOrBuilder
    *
    * repeated .google.spanner.v1.Mutation mutations = 4;
    */
-  java.util.List getMutationsOrBuilderList();
+  java.util.List getMutationsOrBuilderList();
   /**
    *
    *
@@ -195,13 +195,12 @@ public interface CommitRequestOrBuilder
    *
    * repeated .google.spanner.v1.Mutation mutations = 4;
    */
-  MutationOrBuilder getMutationsOrBuilder(int index);
+  com.google.spanner.v1.MutationOrBuilder getMutationsOrBuilder(int index);
 
   /**
    *
    *
    * 
    -<<<<<<< HEAD
    * If `true`, then statistics related to the transaction will be included in
    * the [CommitResponse][google.spanner.v1.CommitResponse.commit_stats]. Default value is
    * `false`.
@@ -217,8 +216,6 @@ public interface CommitRequestOrBuilder
    *
    *
    * 
    -=======
->>>>>>> 5bbb0fe8 ([Tagging Feature] add support for tagging feature)
    * Common options for this request.
    * 
    
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java
index deb2b50573..320d165cf9 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java
@@ -69,43 +69,43 @@ private CommitResponse(
             done = true;
             break;
           case 10:
-          {
-            com.google.protobuf.Timestamp.Builder subBuilder = null;
-            if (commitTimestamp_ != null) {
-              subBuilder = commitTimestamp_.toBuilder();
-            }
-            commitTimestamp_ =
-                input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(commitTimestamp_);
-              commitTimestamp_ = subBuilder.buildPartial();
-            }
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (commitTimestamp_ != null) {
+                subBuilder = commitTimestamp_.toBuilder();
+              }
+              commitTimestamp_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(commitTimestamp_);
+                commitTimestamp_ = subBuilder.buildPartial();
+              }
 
-            break;
-          }
-          case 18:
-          {
-            com.google.spanner.v1.CommitResponse.CommitStats.Builder subBuilder = null;
-            if (commitStats_ != null) {
-              subBuilder = commitStats_.toBuilder();
-            }
-            commitStats_ =
-                input.readMessage(
-                    com.google.spanner.v1.CommitResponse.CommitStats.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(commitStats_);
-              commitStats_ = subBuilder.buildPartial();
+              break;
             }
+          case 18:
+            {
+              com.google.spanner.v1.CommitResponse.CommitStats.Builder subBuilder = null;
+              if (commitStats_ != null) {
+                subBuilder = commitStats_.toBuilder();
+              }
+              commitStats_ =
+                  input.readMessage(
+                      com.google.spanner.v1.CommitResponse.CommitStats.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(commitStats_);
+                commitStats_ = subBuilder.buildPartial();
+              }
 
-            break;
-          }
+              break;
+            }
           default:
-          {
-            if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -125,7 +125,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-  internalGetFieldAccessorTable() {
+      internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto
         .internal_static_google_spanner_v1_CommitResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
@@ -208,17 +208,17 @@ private CommitStats(
               done = true;
               break;
             case 8:
-            {
-              mutationCount_ = input.readInt64();
-              break;
-            }
+              {
+                mutationCount_ = input.readInt64();
+                break;
+              }
             default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
               }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -238,7 +238,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internalGetFieldAccessorTable() {
+        internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_CommitResponse_CommitStats_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -451,7 +451,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
+          internalGetFieldAccessorTable() {
         return com.google.spanner.v1.SpannerProto
             .internal_static_google_spanner_v1_CommitResponse_CommitStats_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1011,7 +1011,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internalGetFieldAccessorTable() {
+        internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_CommitResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -1170,9 +1170,9 @@ public Builder mergeFrom(
 
     private com.google.protobuf.Timestamp commitTimestamp_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Timestamp,
-        com.google.protobuf.Timestamp.Builder,
-        com.google.protobuf.TimestampOrBuilder>
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
         commitTimestampBuilder_;
     /**
      *
@@ -1337,10 +1337,10 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimestampOrBuilder() {
      * .google.protobuf.Timestamp commit_timestamp = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Timestamp,
-        com.google.protobuf.Timestamp.Builder,
-        com.google.protobuf.TimestampOrBuilder>
-    getCommitTimestampFieldBuilder() {
+            com.google.protobuf.Timestamp,
+            com.google.protobuf.Timestamp.Builder,
+            com.google.protobuf.TimestampOrBuilder>
+        getCommitTimestampFieldBuilder() {
       if (commitTimestampBuilder_ == null) {
         commitTimestampBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -1355,9 +1355,9 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimestampOrBuilder() {
 
     private com.google.spanner.v1.CommitResponse.CommitStats commitStats_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.CommitResponse.CommitStats,
-        com.google.spanner.v1.CommitResponse.CommitStats.Builder,
-        com.google.spanner.v1.CommitResponse.CommitStatsOrBuilder>
+            com.google.spanner.v1.CommitResponse.CommitStats,
+            com.google.spanner.v1.CommitResponse.CommitStats.Builder,
+            com.google.spanner.v1.CommitResponse.CommitStatsOrBuilder>
         commitStatsBuilder_;
     /**
      *
@@ -1541,10 +1541,10 @@ public com.google.spanner.v1.CommitResponse.CommitStatsOrBuilder getCommitStatsO
      * .google.spanner.v1.CommitResponse.CommitStats commit_stats = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.CommitResponse.CommitStats,
-        com.google.spanner.v1.CommitResponse.CommitStats.Builder,
-        com.google.spanner.v1.CommitResponse.CommitStatsOrBuilder>
-    getCommitStatsFieldBuilder() {
+            com.google.spanner.v1.CommitResponse.CommitStats,
+            com.google.spanner.v1.CommitResponse.CommitStats.Builder,
+            com.google.spanner.v1.CommitResponse.CommitStatsOrBuilder>
+        getCommitStatsFieldBuilder() {
       if (commitStatsBuilder_ == null) {
         commitStatsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -1606,4 +1606,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.spanner.v1.CommitResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-}
\ No newline at end of file
+}
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java
index fdde650613..ea35c5266a 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java
@@ -41,13 +41,13 @@ private CreateSessionRequest() {
     database_ = "";
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreateSessionRequest();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private CreateSessionRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -72,18 +72,19 @@ private CreateSessionRequest(
             break;
           case 10:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               database_ = s;
               break;
             }
           case 18:
             {
-              Session.Builder subBuilder = null;
+              com.google.spanner.v1.Session.Builder subBuilder = null;
               if (session_ != null) {
                 subBuilder = session_.toBuilder();
               }
-              session_ = input.readMessage(Session.parser(), extensionRegistry);
+              session_ =
+                  input.readMessage(com.google.spanner.v1.Session.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(session_);
                 session_ = subBuilder.buildPartial();
@@ -111,17 +112,22 @@ private CreateSessionRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(CreateSessionRequest.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_CreateSessionRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.CreateSessionRequest.class,
+            com.google.spanner.v1.CreateSessionRequest.Builder.class);
   }
 
   public static final int DATABASE_FIELD_NUMBER = 1;
-  private volatile Object database_;
+  private volatile java.lang.Object database_;
   /**
    *
    *
@@ -135,14 +141,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return The database.
    */
-  @Override
-  public String getDatabase() {
-    Object ref = database_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  public java.lang.String getDatabase() {
+    java.lang.Object ref = database_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       database_ = s;
       return s;
     }
@@ -160,11 +166,12 @@ public String getDatabase() {
    *
    * @return The bytes for database.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getDatabaseBytes() {
-    Object ref = database_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    java.lang.Object ref = database_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       database_ = b;
       return b;
     } else {
@@ -173,7 +180,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
   }
 
   public static final int SESSION_FIELD_NUMBER = 2;
-  private Session session_;
+  private com.google.spanner.v1.Session session_;
   /**
    *
    *
@@ -185,7 +192,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
    *
    * @return Whether the session field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasSession() {
     return session_ != null;
   }
@@ -200,9 +207,9 @@ public boolean hasSession() {
    *
    * @return The session.
    */
-  @Override
-  public Session getSession() {
-    return session_ == null ? Session.getDefaultInstance() : session_;
+  @java.lang.Override
+  public com.google.spanner.v1.Session getSession() {
+    return session_ == null ? com.google.spanner.v1.Session.getDefaultInstance() : session_;
   }
   /**
    *
@@ -213,14 +220,14 @@ public Session getSession() {
    *
    * .google.spanner.v1.Session session = 2;
    */
-  @Override
-  public SessionOrBuilder getSessionOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder() {
     return getSession();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -230,7 +237,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, database_);
@@ -241,7 +248,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -258,15 +265,16 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof CreateSessionRequest)) {
+    if (!(obj instanceof com.google.spanner.v1.CreateSessionRequest)) {
       return super.equals(obj);
     }
-    CreateSessionRequest other = (CreateSessionRequest) obj;
+    com.google.spanner.v1.CreateSessionRequest other =
+        (com.google.spanner.v1.CreateSessionRequest) obj;
 
     if (!getDatabase().equals(other.getDatabase())) return false;
     if (hasSession() != other.hasSession()) return false;
@@ -277,7 +285,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -295,70 +303,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static CreateSessionRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.CreateSessionRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static CreateSessionRequest parseFrom(
+  public static com.google.spanner.v1.CreateSessionRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static CreateSessionRequest parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.CreateSessionRequest parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static CreateSessionRequest parseFrom(
+  public static com.google.spanner.v1.CreateSessionRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static CreateSessionRequest parseFrom(byte[] data)
+  public static com.google.spanner.v1.CreateSessionRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static CreateSessionRequest parseFrom(
+  public static com.google.spanner.v1.CreateSessionRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static CreateSessionRequest parseFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.CreateSessionRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static CreateSessionRequest parseFrom(
+  public static com.google.spanner.v1.CreateSessionRequest 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 CreateSessionRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.CreateSessionRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static CreateSessionRequest parseDelimitedFrom(
+  public static com.google.spanner.v1.CreateSessionRequest 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 CreateSessionRequest parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.CreateSessionRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static CreateSessionRequest parseFrom(
+  public static com.google.spanner.v1.CreateSessionRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -366,7 +375,7 @@ public static CreateSessionRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -375,17 +384,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(CreateSessionRequest prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.CreateSessionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -401,15 +410,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.CreateSessionRequest)
-      CreateSessionRequestOrBuilder {
+      com.google.spanner.v1.CreateSessionRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(CreateSessionRequest.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_CreateSessionRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.CreateSessionRequest.class,
+              com.google.spanner.v1.CreateSessionRequest.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.CreateSessionRequest.newBuilder()
@@ -417,7 +431,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -426,7 +440,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -440,28 +454,30 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
     }
 
-    @Override
-    public CreateSessionRequest getDefaultInstanceForType() {
-      return CreateSessionRequest.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.CreateSessionRequest getDefaultInstanceForType() {
+      return com.google.spanner.v1.CreateSessionRequest.getDefaultInstance();
     }
 
-    @Override
-    public CreateSessionRequest build() {
-      CreateSessionRequest result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.CreateSessionRequest build() {
+      com.google.spanner.v1.CreateSessionRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public CreateSessionRequest buildPartial() {
-      CreateSessionRequest result = new CreateSessionRequest(this);
+    @java.lang.Override
+    public com.google.spanner.v1.CreateSessionRequest buildPartial() {
+      com.google.spanner.v1.CreateSessionRequest result =
+          new com.google.spanner.v1.CreateSessionRequest(this);
       result.database_ = database_;
       if (sessionBuilder_ == null) {
         result.session_ = session_;
@@ -472,50 +488,51 @@ public CreateSessionRequest buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof CreateSessionRequest) {
-        return mergeFrom((CreateSessionRequest) other);
+      if (other instanceof com.google.spanner.v1.CreateSessionRequest) {
+        return mergeFrom((com.google.spanner.v1.CreateSessionRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(CreateSessionRequest other) {
-      if (other == CreateSessionRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.CreateSessionRequest other) {
+      if (other == com.google.spanner.v1.CreateSessionRequest.getDefaultInstance()) return this;
       if (!other.getDatabase().isEmpty()) {
         database_ = other.database_;
         onChanged();
@@ -528,21 +545,21 @@ public Builder mergeFrom(CreateSessionRequest other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      CreateSessionRequest parsedMessage = null;
+      com.google.spanner.v1.CreateSessionRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (CreateSessionRequest) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.CreateSessionRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -552,7 +569,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private Object database_ = "";
+    private java.lang.Object database_ = "";
     /**
      *
      *
@@ -566,15 +583,15 @@ public Builder mergeFrom(
      *
      * @return The database.
      */
-    public String getDatabase() {
-      Object ref = database_;
-      if (!(ref instanceof String)) {
+    public java.lang.String getDatabase() {
+      java.lang.Object ref = database_;
+      if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         database_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -591,10 +608,10 @@ public String getDatabase() {
      * @return The bytes for database.
      */
     public com.google.protobuf.ByteString getDatabaseBytes() {
-      Object ref = database_;
+      java.lang.Object ref = database_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         database_ = b;
         return b;
       } else {
@@ -615,7 +632,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
      * @param value The database to set.
      * @return This builder for chaining.
      */
-    public Builder setDatabase(String value) {
+    public Builder setDatabase(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -668,8 +685,11 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private Session session_;
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.spanner.v1.Session session_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Session,
+            com.google.spanner.v1.Session.Builder,
+            com.google.spanner.v1.SessionOrBuilder>
         sessionBuilder_;
     /**
      *
@@ -696,9 +716,9 @@ public boolean hasSession() {
      *
      * @return The session.
      */
-    public Session getSession() {
+    public com.google.spanner.v1.Session getSession() {
       if (sessionBuilder_ == null) {
-        return session_ == null ? Session.getDefaultInstance() : session_;
+        return session_ == null ? com.google.spanner.v1.Session.getDefaultInstance() : session_;
       } else {
         return sessionBuilder_.getMessage();
       }
@@ -712,7 +732,7 @@ public Session getSession() {
      *
      * .google.spanner.v1.Session session = 2;
      */
-    public Builder setSession(Session value) {
+    public Builder setSession(com.google.spanner.v1.Session value) {
       if (sessionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -734,7 +754,7 @@ public Builder setSession(Session value) {
      *
      * .google.spanner.v1.Session session = 2;
      */
-    public Builder setSession(Session.Builder builderForValue) {
+    public Builder setSession(com.google.spanner.v1.Session.Builder builderForValue) {
       if (sessionBuilder_ == null) {
         session_ = builderForValue.build();
         onChanged();
@@ -753,10 +773,11 @@ public Builder setSession(Session.Builder builderForValue) {
      *
      * .google.spanner.v1.Session session = 2;
      */
-    public Builder mergeSession(Session value) {
+    public Builder mergeSession(com.google.spanner.v1.Session value) {
       if (sessionBuilder_ == null) {
         if (session_ != null) {
-          session_ = Session.newBuilder(session_).mergeFrom(value).buildPartial();
+          session_ =
+              com.google.spanner.v1.Session.newBuilder(session_).mergeFrom(value).buildPartial();
         } else {
           session_ = value;
         }
@@ -796,7 +817,7 @@ public Builder clearSession() {
      *
      * .google.spanner.v1.Session session = 2;
      */
-    public Session.Builder getSessionBuilder() {
+    public com.google.spanner.v1.Session.Builder getSessionBuilder() {
 
       onChanged();
       return getSessionFieldBuilder().getBuilder();
@@ -810,11 +831,11 @@ public Session.Builder getSessionBuilder() {
      *
      * .google.spanner.v1.Session session = 2;
      */
-    public SessionOrBuilder getSessionOrBuilder() {
+    public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder() {
       if (sessionBuilder_ != null) {
         return sessionBuilder_.getMessageOrBuilder();
       } else {
-        return session_ == null ? Session.getDefaultInstance() : session_;
+        return session_ == null ? com.google.spanner.v1.Session.getDefaultInstance() : session_;
       }
     }
     /**
@@ -826,24 +847,29 @@ public SessionOrBuilder getSessionOrBuilder() {
      *
      * .google.spanner.v1.Session session = 2;
      */
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Session,
+            com.google.spanner.v1.Session.Builder,
+            com.google.spanner.v1.SessionOrBuilder>
         getSessionFieldBuilder() {
       if (sessionBuilder_ == null) {
         sessionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                Session, Session.Builder, SessionOrBuilder>(
+                com.google.spanner.v1.Session,
+                com.google.spanner.v1.Session.Builder,
+                com.google.spanner.v1.SessionOrBuilder>(
                 getSession(), getParentForChildren(), isClean());
         session_ = null;
       }
       return sessionBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -853,19 +879,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.CreateSessionRequest)
-  private static final CreateSessionRequest DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.CreateSessionRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new CreateSessionRequest();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.CreateSessionRequest();
   }
 
-  public static CreateSessionRequest getDefaultInstance() {
+  public static com.google.spanner.v1.CreateSessionRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public CreateSessionRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -878,13 +904,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public CreateSessionRequest getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.CreateSessionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequestOrBuilder.java
index c4f3457143..3966d85f95 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface CreateSessionRequestOrBuilder
    *
    * @return The database.
    */
-  String getDatabase();
+  java.lang.String getDatabase();
   /**
    *
    *
@@ -75,7 +75,7 @@ public interface CreateSessionRequestOrBuilder
    *
    * @return The session.
    */
-  Session getSession();
+  com.google.spanner.v1.Session getSession();
   /**
    *
    *
@@ -85,5 +85,5 @@ public interface CreateSessionRequestOrBuilder
    *
    * .google.spanner.v1.Session session = 2;
    */
-  SessionOrBuilder getSessionOrBuilder();
+  com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java
index 974d6345eb..ca462176e7 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java
@@ -41,13 +41,13 @@ private DeleteSessionRequest() {
     name_ = "";
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DeleteSessionRequest();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private DeleteSessionRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -72,7 +72,7 @@ private DeleteSessionRequest(
             break;
           case 10:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               name_ = s;
               break;
@@ -97,17 +97,22 @@ private DeleteSessionRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(DeleteSessionRequest.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_DeleteSessionRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.DeleteSessionRequest.class,
+            com.google.spanner.v1.DeleteSessionRequest.Builder.class);
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile Object name_;
+  private volatile java.lang.Object name_;
   /**
    *
    *
@@ -121,14 +126,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return The name.
    */
-  @Override
-  public String getName() {
-    Object ref = name_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  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;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       name_ = s;
       return s;
     }
@@ -146,11 +151,12 @@ public String getName() {
    *
    * @return The bytes for name.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getNameBytes() {
-    Object ref = name_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    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 {
@@ -160,7 +166,7 @@ public com.google.protobuf.ByteString getNameBytes() {
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -170,7 +176,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
@@ -178,7 +184,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -192,22 +198,23 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof DeleteSessionRequest)) {
+    if (!(obj instanceof com.google.spanner.v1.DeleteSessionRequest)) {
       return super.equals(obj);
     }
-    DeleteSessionRequest other = (DeleteSessionRequest) obj;
+    com.google.spanner.v1.DeleteSessionRequest other =
+        (com.google.spanner.v1.DeleteSessionRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -221,70 +228,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static DeleteSessionRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static DeleteSessionRequest parseFrom(
+  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static DeleteSessionRequest parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static DeleteSessionRequest parseFrom(
+  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static DeleteSessionRequest parseFrom(byte[] data)
+  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static DeleteSessionRequest parseFrom(
+  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static DeleteSessionRequest parseFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static DeleteSessionRequest parseFrom(
+  public static com.google.spanner.v1.DeleteSessionRequest 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 DeleteSessionRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.DeleteSessionRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static DeleteSessionRequest parseDelimitedFrom(
+  public static com.google.spanner.v1.DeleteSessionRequest 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 DeleteSessionRequest parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static DeleteSessionRequest parseFrom(
+  public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -292,7 +300,7 @@ public static DeleteSessionRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -301,17 +309,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(DeleteSessionRequest prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.DeleteSessionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -327,15 +335,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.DeleteSessionRequest)
-      DeleteSessionRequestOrBuilder {
+      com.google.spanner.v1.DeleteSessionRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(DeleteSessionRequest.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_DeleteSessionRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.DeleteSessionRequest.class,
+              com.google.spanner.v1.DeleteSessionRequest.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.DeleteSessionRequest.newBuilder()
@@ -343,7 +356,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -352,7 +365,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -360,77 +373,80 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
     }
 
-    @Override
-    public DeleteSessionRequest getDefaultInstanceForType() {
-      return DeleteSessionRequest.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.DeleteSessionRequest getDefaultInstanceForType() {
+      return com.google.spanner.v1.DeleteSessionRequest.getDefaultInstance();
     }
 
-    @Override
-    public DeleteSessionRequest build() {
-      DeleteSessionRequest result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.DeleteSessionRequest build() {
+      com.google.spanner.v1.DeleteSessionRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public DeleteSessionRequest buildPartial() {
-      DeleteSessionRequest result = new DeleteSessionRequest(this);
+    @java.lang.Override
+    public com.google.spanner.v1.DeleteSessionRequest buildPartial() {
+      com.google.spanner.v1.DeleteSessionRequest result =
+          new com.google.spanner.v1.DeleteSessionRequest(this);
       result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof DeleteSessionRequest) {
-        return mergeFrom((DeleteSessionRequest) other);
+      if (other instanceof com.google.spanner.v1.DeleteSessionRequest) {
+        return mergeFrom((com.google.spanner.v1.DeleteSessionRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(DeleteSessionRequest other) {
-      if (other == DeleteSessionRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.DeleteSessionRequest other) {
+      if (other == com.google.spanner.v1.DeleteSessionRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
         onChanged();
@@ -440,21 +456,21 @@ public Builder mergeFrom(DeleteSessionRequest other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      DeleteSessionRequest parsedMessage = null;
+      com.google.spanner.v1.DeleteSessionRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (DeleteSessionRequest) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.DeleteSessionRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -464,7 +480,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private Object name_ = "";
+    private java.lang.Object name_ = "";
     /**
      *
      *
@@ -478,15 +494,15 @@ public Builder mergeFrom(
      *
      * @return The name.
      */
-    public String getName() {
-      Object ref = name_;
-      if (!(ref instanceof String)) {
+    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;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         name_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -503,10 +519,10 @@ public String getName() {
      * @return The bytes for name.
      */
     public com.google.protobuf.ByteString getNameBytes() {
-      Object ref = name_;
+      java.lang.Object ref = name_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         name_ = b;
         return b;
       } else {
@@ -527,7 +543,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      * @param value The name to set.
      * @return This builder for chaining.
      */
-    public Builder setName(String value) {
+    public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -580,12 +596,12 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -595,19 +611,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.DeleteSessionRequest)
-  private static final DeleteSessionRequest DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.DeleteSessionRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new DeleteSessionRequest();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.DeleteSessionRequest();
   }
 
-  public static DeleteSessionRequest getDefaultInstance() {
+  public static com.google.spanner.v1.DeleteSessionRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public DeleteSessionRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -620,13 +636,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public DeleteSessionRequest getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.DeleteSessionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequestOrBuilder.java
index 1107a65932..5774259370 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface DeleteSessionRequestOrBuilder
    *
    * @return The name.
    */
-  String getName();
+  java.lang.String getName();
   /**
    *
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequest.java
index e128839b02..0a7820ed53 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequest.java
@@ -73,70 +73,70 @@ private ExecuteBatchDmlRequest(
             done = true;
             break;
           case 10:
-          {
-            java.lang.String s = input.readStringRequireUtf8();
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            session_ = s;
-            break;
-          }
-          case 18:
-          {
-            com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
-            if (transaction_ != null) {
-              subBuilder = transaction_.toBuilder();
-            }
-            transaction_ =
-                input.readMessage(
-                    com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(transaction_);
-              transaction_ = subBuilder.buildPartial();
+              session_ = s;
+              break;
             }
+          case 18:
+            {
+              com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
+              if (transaction_ != null) {
+                subBuilder = transaction_.toBuilder();
+              }
+              transaction_ =
+                  input.readMessage(
+                      com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(transaction_);
+                transaction_ = subBuilder.buildPartial();
+              }
 
-            break;
-          }
+              break;
+            }
           case 26:
-          {
-            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-              statements_ =
-                  new java.util.ArrayList<
-                      com.google.spanner.v1.ExecuteBatchDmlRequest.Statement>();
-              mutable_bitField0_ |= 0x00000001;
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                statements_ =
+                    new java.util.ArrayList<
+                        com.google.spanner.v1.ExecuteBatchDmlRequest.Statement>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              statements_.add(
+                  input.readMessage(
+                      com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.parser(),
+                      extensionRegistry));
+              break;
             }
-            statements_.add(
-                input.readMessage(
-                    com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.parser(),
-                    extensionRegistry));
-            break;
-          }
           case 32:
-          {
-            seqno_ = input.readInt64();
-            break;
-          }
-          case 42:
-          {
-            com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
-            if (requestOptions_ != null) {
-              subBuilder = requestOptions_.toBuilder();
-            }
-            requestOptions_ =
-                input.readMessage(
-                    com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(requestOptions_);
-              requestOptions_ = subBuilder.buildPartial();
+            {
+              seqno_ = input.readInt64();
+              break;
             }
+          case 42:
+            {
+              com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
+              if (requestOptions_ != null) {
+                subBuilder = requestOptions_.toBuilder();
+              }
+              requestOptions_ =
+                  input.readMessage(
+                      com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(requestOptions_);
+                requestOptions_ = subBuilder.buildPartial();
+              }
 
-            break;
-          }
+              break;
+            }
           default:
-          {
-            if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -159,7 +159,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-  internalGetFieldAccessorTable() {
+      internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto
         .internal_static_google_spanner_v1_ExecuteBatchDmlRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
@@ -392,49 +392,49 @@ private Statement(
               done = true;
               break;
             case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+              {
+                java.lang.String s = input.readStringRequireUtf8();
 
-              sql_ = s;
-              break;
-            }
-            case 18:
-            {
-              com.google.protobuf.Struct.Builder subBuilder = null;
-              if (params_ != null) {
-                subBuilder = params_.toBuilder();
+                sql_ = s;
+                break;
               }
-              params_ = input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(params_);
-                params_ = subBuilder.buildPartial();
+            case 18:
+              {
+                com.google.protobuf.Struct.Builder subBuilder = null;
+                if (params_ != null) {
+                  subBuilder = params_.toBuilder();
+                }
+                params_ = input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(params_);
+                  params_ = subBuilder.buildPartial();
+                }
+
+                break;
               }
-
-              break;
-            }
             case 26:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                paramTypes_ =
-                    com.google.protobuf.MapField.newMapField(
-                        ParamTypesDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
+              {
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  paramTypes_ =
+                      com.google.protobuf.MapField.newMapField(
+                          ParamTypesDefaultEntryHolder.defaultEntry);
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                com.google.protobuf.MapEntry
+                    paramTypes__ =
+                        input.readMessage(
+                            ParamTypesDefaultEntryHolder.defaultEntry.getParserForType(),
+                            extensionRegistry);
+                paramTypes_.getMutableMap().put(paramTypes__.getKey(), paramTypes__.getValue());
+                break;
               }
-              com.google.protobuf.MapEntry
-                  paramTypes__ =
-                  input.readMessage(
-                      ParamTypesDefaultEntryHolder.defaultEntry.getParserForType(),
-                      extensionRegistry);
-              paramTypes_.getMutableMap().put(paramTypes__.getKey(), paramTypes__.getValue());
-              break;
-            }
             default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
               }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -465,7 +465,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internalGetFieldAccessorTable() {
+        internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_ExecuteBatchDmlRequest_Statement_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -594,20 +594,20 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
     private static final class ParamTypesDefaultEntryHolder {
       static final com.google.protobuf.MapEntry
           defaultEntry =
-          com.google.protobuf.MapEntry
-              .newDefaultInstance(
-                  com.google.spanner.v1.SpannerProto
-                      .internal_static_google_spanner_v1_ExecuteBatchDmlRequest_Statement_ParamTypesEntry_descriptor,
-                  com.google.protobuf.WireFormat.FieldType.STRING,
-                  "",
-                  com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                  com.google.spanner.v1.Type.getDefaultInstance());
+              com.google.protobuf.MapEntry
+                  .newDefaultInstance(
+                      com.google.spanner.v1.SpannerProto
+                          .internal_static_google_spanner_v1_ExecuteBatchDmlRequest_Statement_ParamTypesEntry_descriptor,
+                      com.google.protobuf.WireFormat.FieldType.STRING,
+                      "",
+                      com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                      com.google.spanner.v1.Type.getDefaultInstance());
     }
 
     private com.google.protobuf.MapField paramTypes_;
 
     private com.google.protobuf.MapField
-    internalGetParamTypes() {
+        internalGetParamTypes() {
       if (paramTypes_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             ParamTypesDefaultEntryHolder.defaultEntry);
@@ -951,7 +951,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
+          internalGetFieldAccessorTable() {
         return com.google.spanner.v1.SpannerProto
             .internal_static_google_spanner_v1_ExecuteBatchDmlRequest_Statement_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1221,9 +1221,9 @@ public Builder setSqlBytes(com.google.protobuf.ByteString value) {
 
       private com.google.protobuf.Struct params_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Struct,
-          com.google.protobuf.Struct.Builder,
-          com.google.protobuf.StructOrBuilder>
+              com.google.protobuf.Struct,
+              com.google.protobuf.Struct.Builder,
+              com.google.protobuf.StructOrBuilder>
           paramsBuilder_;
       /**
        *
@@ -1445,10 +1445,10 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
        * .google.protobuf.Struct params = 2;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.protobuf.Struct,
-          com.google.protobuf.Struct.Builder,
-          com.google.protobuf.StructOrBuilder>
-      getParamsFieldBuilder() {
+              com.google.protobuf.Struct,
+              com.google.protobuf.Struct.Builder,
+              com.google.protobuf.StructOrBuilder>
+          getParamsFieldBuilder() {
         if (paramsBuilder_ == null) {
           paramsBuilder_ =
               new com.google.protobuf.SingleFieldBuilderV3<
@@ -1465,7 +1465,7 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
           paramTypes_;
 
       private com.google.protobuf.MapField
-      internalGetParamTypes() {
+          internalGetParamTypes() {
         if (paramTypes_ == null) {
           return com.google.protobuf.MapField.emptyMapField(
               ParamTypesDefaultEntryHolder.defaultEntry);
@@ -1474,7 +1474,7 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
       }
 
       private com.google.protobuf.MapField
-      internalGetMutableParamTypes() {
+          internalGetMutableParamTypes() {
         onChanged();
         ;
         if (paramTypes_ == null) {
@@ -1854,7 +1854,7 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
    */
   @java.lang.Override
   public java.util.List
-  getStatementsList() {
+      getStatementsList() {
     return statements_;
   }
   /**
@@ -1874,7 +1874,7 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
    */
   @java.lang.Override
   public java.util.List
-  getStatementsOrBuilderList() {
+      getStatementsOrBuilderList() {
     return statements_;
   }
   /**
@@ -2235,7 +2235,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internalGetFieldAccessorTable() {
+        internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_ExecuteBatchDmlRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -2571,9 +2571,9 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
 
     private com.google.spanner.v1.TransactionSelector transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.TransactionSelector,
-        com.google.spanner.v1.TransactionSelector.Builder,
-        com.google.spanner.v1.TransactionSelectorOrBuilder>
+            com.google.spanner.v1.TransactionSelector,
+            com.google.spanner.v1.TransactionSelector.Builder,
+            com.google.spanner.v1.TransactionSelectorOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -2784,10 +2784,10 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
      * 
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.TransactionSelector,
-        com.google.spanner.v1.TransactionSelector.Builder,
-        com.google.spanner.v1.TransactionSelectorOrBuilder>
-    getTransactionFieldBuilder() {
+            com.google.spanner.v1.TransactionSelector,
+            com.google.spanner.v1.TransactionSelector.Builder,
+            com.google.spanner.v1.TransactionSelectorOrBuilder>
+        getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -2813,9 +2813,9 @@ private void ensureStatementsIsMutable() {
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.spanner.v1.ExecuteBatchDmlRequest.Statement,
-        com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.Builder,
-        com.google.spanner.v1.ExecuteBatchDmlRequest.StatementOrBuilder>
+            com.google.spanner.v1.ExecuteBatchDmlRequest.Statement,
+            com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.Builder,
+            com.google.spanner.v1.ExecuteBatchDmlRequest.StatementOrBuilder>
         statementsBuilder_;
 
     /**
@@ -2834,7 +2834,7 @@ private void ensureStatementsIsMutable() {
      * 
      */
     public java.util.List
-    getStatementsList() {
+        getStatementsList() {
       if (statementsBuilder_ == null) {
         return java.util.Collections.unmodifiableList(statements_);
       } else {
@@ -3184,7 +3184,7 @@ public com.google.spanner.v1.ExecuteBatchDmlRequest.StatementOrBuilder getStatem
      * 
      */
     public java.util.List
-    getStatementsOrBuilderList() {
+        getStatementsOrBuilderList() {
       if (statementsBuilder_ != null) {
         return statementsBuilder_.getMessageOrBuilderList();
       } else {
@@ -3247,15 +3247,15 @@ public com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.Builder addStateme
      * 
      */
     public java.util.List
-    getStatementsBuilderList() {
+        getStatementsBuilderList() {
       return getStatementsFieldBuilder().getBuilderList();
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.spanner.v1.ExecuteBatchDmlRequest.Statement,
-        com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.Builder,
-        com.google.spanner.v1.ExecuteBatchDmlRequest.StatementOrBuilder>
-    getStatementsFieldBuilder() {
+            com.google.spanner.v1.ExecuteBatchDmlRequest.Statement,
+            com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.Builder,
+            com.google.spanner.v1.ExecuteBatchDmlRequest.StatementOrBuilder>
+        getStatementsFieldBuilder() {
       if (statementsBuilder_ == null) {
         statementsBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -3340,9 +3340,9 @@ public Builder clearSeqno() {
 
     private com.google.spanner.v1.RequestOptions requestOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.RequestOptions,
-        com.google.spanner.v1.RequestOptions.Builder,
-        com.google.spanner.v1.RequestOptionsOrBuilder>
+            com.google.spanner.v1.RequestOptions,
+            com.google.spanner.v1.RequestOptions.Builder,
+            com.google.spanner.v1.RequestOptionsOrBuilder>
         requestOptionsBuilder_;
     /**
      *
@@ -3507,10 +3507,10 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder(
      * .google.spanner.v1.RequestOptions request_options = 5;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.RequestOptions,
-        com.google.spanner.v1.RequestOptions.Builder,
-        com.google.spanner.v1.RequestOptionsOrBuilder>
-    getRequestOptionsFieldBuilder() {
+            com.google.spanner.v1.RequestOptions,
+            com.google.spanner.v1.RequestOptions.Builder,
+            com.google.spanner.v1.RequestOptionsOrBuilder>
+        getRequestOptionsFieldBuilder() {
       if (requestOptionsBuilder_ == null) {
         requestOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -3572,4 +3572,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.spanner.v1.ExecuteBatchDmlRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-}
\ No newline at end of file
+}
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequestOrBuilder.java
index 6fcd56732c..8736410669 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface ExecuteBatchDmlRequestOrBuilder
    *
    * @return The session.
    */
-  String getSession();
+  java.lang.String getSession();
   /**
    *
    *
@@ -85,7 +85,7 @@ public interface ExecuteBatchDmlRequestOrBuilder
    *
    * @return The transaction.
    */
-  TransactionSelector getTransaction();
+  com.google.spanner.v1.TransactionSelector getTransaction();
   /**
    *
    *
@@ -100,7 +100,7 @@ public interface ExecuteBatchDmlRequestOrBuilder
    * .google.spanner.v1.TransactionSelector transaction = 2 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
-  TransactionSelectorOrBuilder getTransactionOrBuilder();
+  com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder();
 
   /**
    *
@@ -117,7 +117,7 @@ public interface ExecuteBatchDmlRequestOrBuilder
    * repeated .google.spanner.v1.ExecuteBatchDmlRequest.Statement statements = 3 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
-  java.util.List getStatementsList();
+  java.util.List getStatementsList();
   /**
    *
    *
@@ -133,7 +133,7 @@ public interface ExecuteBatchDmlRequestOrBuilder
    * repeated .google.spanner.v1.ExecuteBatchDmlRequest.Statement statements = 3 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
-  ExecuteBatchDmlRequest.Statement getStatements(int index);
+  com.google.spanner.v1.ExecuteBatchDmlRequest.Statement getStatements(int index);
   /**
    *
    *
@@ -165,7 +165,8 @@ public interface ExecuteBatchDmlRequestOrBuilder
    * repeated .google.spanner.v1.ExecuteBatchDmlRequest.Statement statements = 3 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
-  java.util.List getStatementsOrBuilderList();
+  java.util.List
+      getStatementsOrBuilderList();
   /**
    *
    *
@@ -181,7 +182,7 @@ public interface ExecuteBatchDmlRequestOrBuilder
    * repeated .google.spanner.v1.ExecuteBatchDmlRequest.Statement statements = 3 [(.google.api.field_behavior) = REQUIRED];
    * 
    */
-  ExecuteBatchDmlRequest.StatementOrBuilder getStatementsOrBuilder(int index);
+  com.google.spanner.v1.ExecuteBatchDmlRequest.StatementOrBuilder getStatementsOrBuilder(int index);
 
   /**
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponse.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponse.java
index 62b1a81ed3..814553409d 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponse.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponse.java
@@ -58,13 +58,13 @@ private ExecuteBatchDmlResponse() {
     resultSets_ = java.util.Collections.emptyList();
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ExecuteBatchDmlResponse();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -75,7 +75,7 @@ private ExecuteBatchDmlResponse(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -91,10 +91,11 @@ private ExecuteBatchDmlResponse(
           case 10:
             {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                resultSets_ = new java.util.ArrayList();
+                resultSets_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              resultSets_.add(input.readMessage(ResultSet.parser(), extensionRegistry));
+              resultSets_.add(
+                  input.readMessage(com.google.spanner.v1.ResultSet.parser(), extensionRegistry));
               break;
             }
           case 18:
@@ -134,17 +135,22 @@ private ExecuteBatchDmlResponse(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_ExecuteBatchDmlResponse_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_ExecuteBatchDmlResponse_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto.internal_static_google_spanner_v1_ExecuteBatchDmlResponse_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(ExecuteBatchDmlResponse.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_ExecuteBatchDmlResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.ExecuteBatchDmlResponse.class,
+            com.google.spanner.v1.ExecuteBatchDmlResponse.Builder.class);
   }
 
   public static final int RESULT_SETS_FIELD_NUMBER = 1;
-  private java.util.List resultSets_;
+  private java.util.List resultSets_;
   /**
    *
    *
@@ -159,8 +165,8 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  @Override
-  public java.util.List getResultSetsList() {
+  @java.lang.Override
+  public java.util.List getResultSetsList() {
     return resultSets_;
   }
   /**
@@ -177,8 +183,9 @@ public java.util.List getResultSetsList() {
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  @Override
-  public java.util.List getResultSetsOrBuilderList() {
+  @java.lang.Override
+  public java.util.List
+      getResultSetsOrBuilderList() {
     return resultSets_;
   }
   /**
@@ -195,7 +202,7 @@ public java.util.List getResultSetsOrBuilderList()
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  @Override
+  @java.lang.Override
   public int getResultSetsCount() {
     return resultSets_.size();
   }
@@ -213,8 +220,8 @@ public int getResultSetsCount() {
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  @Override
-  public ResultSet getResultSets(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.ResultSet getResultSets(int index) {
     return resultSets_.get(index);
   }
   /**
@@ -231,8 +238,8 @@ public ResultSet getResultSets(int index) {
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  @Override
-  public ResultSetOrBuilder getResultSetsOrBuilder(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.ResultSetOrBuilder getResultSetsOrBuilder(int index) {
     return resultSets_.get(index);
   }
 
@@ -250,7 +257,7 @@ public ResultSetOrBuilder getResultSetsOrBuilder(int index) {
    *
    * @return Whether the status field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasStatus() {
     return status_ != null;
   }
@@ -266,7 +273,7 @@ public boolean hasStatus() {
    *
    * @return The status.
    */
-  @Override
+  @java.lang.Override
   public com.google.rpc.Status getStatus() {
     return status_ == null ? com.google.rpc.Status.getDefaultInstance() : status_;
   }
@@ -280,14 +287,14 @@ public com.google.rpc.Status getStatus() {
    *
    * .google.rpc.Status status = 2;
    */
-  @Override
+  @java.lang.Override
   public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
     return getStatus();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -297,7 +304,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < resultSets_.size(); i++) {
       output.writeMessage(1, resultSets_.get(i));
@@ -308,7 +315,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -325,15 +332,16 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof ExecuteBatchDmlResponse)) {
+    if (!(obj instanceof com.google.spanner.v1.ExecuteBatchDmlResponse)) {
       return super.equals(obj);
     }
-    ExecuteBatchDmlResponse other = (ExecuteBatchDmlResponse) obj;
+    com.google.spanner.v1.ExecuteBatchDmlResponse other =
+        (com.google.spanner.v1.ExecuteBatchDmlResponse) obj;
 
     if (!getResultSetsList().equals(other.getResultSetsList())) return false;
     if (hasStatus() != other.hasStatus()) return false;
@@ -344,7 +352,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -364,70 +372,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static ExecuteBatchDmlResponse parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ExecuteBatchDmlResponse parseFrom(
+  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ExecuteBatchDmlResponse parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ExecuteBatchDmlResponse parseFrom(
+  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ExecuteBatchDmlResponse parseFrom(byte[] data)
+  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ExecuteBatchDmlResponse parseFrom(
+  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ExecuteBatchDmlResponse parseFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static ExecuteBatchDmlResponse parseFrom(
+  public static com.google.spanner.v1.ExecuteBatchDmlResponse 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 ExecuteBatchDmlResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static ExecuteBatchDmlResponse parseDelimitedFrom(
+  public static com.google.spanner.v1.ExecuteBatchDmlResponse 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 ExecuteBatchDmlResponse parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static ExecuteBatchDmlResponse parseFrom(
+  public static com.google.spanner.v1.ExecuteBatchDmlResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -435,7 +444,7 @@ public static ExecuteBatchDmlResponse parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -444,17 +453,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(ExecuteBatchDmlResponse prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.ExecuteBatchDmlResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -487,16 +496,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.ExecuteBatchDmlResponse)
-      ExecuteBatchDmlResponseOrBuilder {
+      com.google.spanner.v1.ExecuteBatchDmlResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_ExecuteBatchDmlResponse_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_ExecuteBatchDmlResponse_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_ExecuteBatchDmlResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(ExecuteBatchDmlResponse.class, Builder.class);
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.ExecuteBatchDmlResponse.class,
+              com.google.spanner.v1.ExecuteBatchDmlResponse.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.ExecuteBatchDmlResponse.newBuilder()
@@ -504,7 +517,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -515,7 +528,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (resultSetsBuilder_ == null) {
@@ -533,28 +546,30 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_ExecuteBatchDmlResponse_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_ExecuteBatchDmlResponse_descriptor;
     }
 
-    @Override
-    public ExecuteBatchDmlResponse getDefaultInstanceForType() {
-      return ExecuteBatchDmlResponse.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.ExecuteBatchDmlResponse getDefaultInstanceForType() {
+      return com.google.spanner.v1.ExecuteBatchDmlResponse.getDefaultInstance();
     }
 
-    @Override
-    public ExecuteBatchDmlResponse build() {
-      ExecuteBatchDmlResponse result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.ExecuteBatchDmlResponse build() {
+      com.google.spanner.v1.ExecuteBatchDmlResponse result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public ExecuteBatchDmlResponse buildPartial() {
-      ExecuteBatchDmlResponse result = new ExecuteBatchDmlResponse(this);
+    @java.lang.Override
+    public com.google.spanner.v1.ExecuteBatchDmlResponse buildPartial() {
+      com.google.spanner.v1.ExecuteBatchDmlResponse result =
+          new com.google.spanner.v1.ExecuteBatchDmlResponse(this);
       int from_bitField0_ = bitField0_;
       if (resultSetsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -574,50 +589,51 @@ public ExecuteBatchDmlResponse buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof ExecuteBatchDmlResponse) {
-        return mergeFrom((ExecuteBatchDmlResponse) other);
+      if (other instanceof com.google.spanner.v1.ExecuteBatchDmlResponse) {
+        return mergeFrom((com.google.spanner.v1.ExecuteBatchDmlResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(ExecuteBatchDmlResponse other) {
-      if (other == ExecuteBatchDmlResponse.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.ExecuteBatchDmlResponse other) {
+      if (other == com.google.spanner.v1.ExecuteBatchDmlResponse.getDefaultInstance()) return this;
       if (resultSetsBuilder_ == null) {
         if (!other.resultSets_.isEmpty()) {
           if (resultSets_.isEmpty()) {
@@ -653,21 +669,21 @@ public Builder mergeFrom(ExecuteBatchDmlResponse other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      ExecuteBatchDmlResponse parsedMessage = null;
+      com.google.spanner.v1.ExecuteBatchDmlResponse parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (ExecuteBatchDmlResponse) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.ExecuteBatchDmlResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -679,17 +695,20 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.util.List resultSets_ = java.util.Collections.emptyList();
+    private java.util.List resultSets_ =
+        java.util.Collections.emptyList();
 
     private void ensureResultSetsIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        resultSets_ = new java.util.ArrayList(resultSets_);
+        resultSets_ = new java.util.ArrayList(resultSets_);
         bitField0_ |= 0x00000001;
       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            ResultSet, ResultSet.Builder, ResultSetOrBuilder>
+            com.google.spanner.v1.ResultSet,
+            com.google.spanner.v1.ResultSet.Builder,
+            com.google.spanner.v1.ResultSetOrBuilder>
         resultSetsBuilder_;
 
     /**
@@ -706,7 +725,7 @@ private void ensureResultSetsIsMutable() {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public java.util.List getResultSetsList() {
+    public java.util.List getResultSetsList() {
       if (resultSetsBuilder_ == null) {
         return java.util.Collections.unmodifiableList(resultSets_);
       } else {
@@ -748,7 +767,7 @@ public int getResultSetsCount() {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public ResultSet getResultSets(int index) {
+    public com.google.spanner.v1.ResultSet getResultSets(int index) {
       if (resultSetsBuilder_ == null) {
         return resultSets_.get(index);
       } else {
@@ -769,7 +788,7 @@ public ResultSet getResultSets(int index) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder setResultSets(int index, ResultSet value) {
+    public Builder setResultSets(int index, com.google.spanner.v1.ResultSet value) {
       if (resultSetsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -796,7 +815,8 @@ public Builder setResultSets(int index, ResultSet value) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder setResultSets(int index, ResultSet.Builder builderForValue) {
+    public Builder setResultSets(
+        int index, com.google.spanner.v1.ResultSet.Builder builderForValue) {
       if (resultSetsBuilder_ == null) {
         ensureResultSetsIsMutable();
         resultSets_.set(index, builderForValue.build());
@@ -820,7 +840,7 @@ public Builder setResultSets(int index, ResultSet.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder addResultSets(ResultSet value) {
+    public Builder addResultSets(com.google.spanner.v1.ResultSet value) {
       if (resultSetsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -847,7 +867,7 @@ public Builder addResultSets(ResultSet value) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder addResultSets(int index, ResultSet value) {
+    public Builder addResultSets(int index, com.google.spanner.v1.ResultSet value) {
       if (resultSetsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -874,7 +894,7 @@ public Builder addResultSets(int index, ResultSet value) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder addResultSets(ResultSet.Builder builderForValue) {
+    public Builder addResultSets(com.google.spanner.v1.ResultSet.Builder builderForValue) {
       if (resultSetsBuilder_ == null) {
         ensureResultSetsIsMutable();
         resultSets_.add(builderForValue.build());
@@ -898,7 +918,8 @@ public Builder addResultSets(ResultSet.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder addResultSets(int index, ResultSet.Builder builderForValue) {
+    public Builder addResultSets(
+        int index, com.google.spanner.v1.ResultSet.Builder builderForValue) {
       if (resultSetsBuilder_ == null) {
         ensureResultSetsIsMutable();
         resultSets_.add(index, builderForValue.build());
@@ -922,7 +943,8 @@ public Builder addResultSets(int index, ResultSet.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public Builder addAllResultSets(Iterable values) {
+    public Builder addAllResultSets(
+        java.lang.Iterable values) {
       if (resultSetsBuilder_ == null) {
         ensureResultSetsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, resultSets_);
@@ -994,7 +1016,7 @@ public Builder removeResultSets(int index) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public ResultSet.Builder getResultSetsBuilder(int index) {
+    public com.google.spanner.v1.ResultSet.Builder getResultSetsBuilder(int index) {
       return getResultSetsFieldBuilder().getBuilder(index);
     }
     /**
@@ -1011,7 +1033,7 @@ public ResultSet.Builder getResultSetsBuilder(int index) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public ResultSetOrBuilder getResultSetsOrBuilder(int index) {
+    public com.google.spanner.v1.ResultSetOrBuilder getResultSetsOrBuilder(int index) {
       if (resultSetsBuilder_ == null) {
         return resultSets_.get(index);
       } else {
@@ -1032,7 +1054,8 @@ public ResultSetOrBuilder getResultSetsOrBuilder(int index) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public java.util.List getResultSetsOrBuilderList() {
+    public java.util.List
+        getResultSetsOrBuilderList() {
       if (resultSetsBuilder_ != null) {
         return resultSetsBuilder_.getMessageOrBuilderList();
       } else {
@@ -1053,8 +1076,9 @@ public java.util.List getResultSetsOrBuilderList()
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public ResultSet.Builder addResultSetsBuilder() {
-      return getResultSetsFieldBuilder().addBuilder(ResultSet.getDefaultInstance());
+    public com.google.spanner.v1.ResultSet.Builder addResultSetsBuilder() {
+      return getResultSetsFieldBuilder()
+          .addBuilder(com.google.spanner.v1.ResultSet.getDefaultInstance());
     }
     /**
      *
@@ -1070,8 +1094,9 @@ public ResultSet.Builder addResultSetsBuilder() {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public ResultSet.Builder addResultSetsBuilder(int index) {
-      return getResultSetsFieldBuilder().addBuilder(index, ResultSet.getDefaultInstance());
+    public com.google.spanner.v1.ResultSet.Builder addResultSetsBuilder(int index) {
+      return getResultSetsFieldBuilder()
+          .addBuilder(index, com.google.spanner.v1.ResultSet.getDefaultInstance());
     }
     /**
      *
@@ -1087,17 +1112,21 @@ public ResultSet.Builder addResultSetsBuilder(int index) {
      *
      * repeated .google.spanner.v1.ResultSet result_sets = 1;
      */
-    public java.util.List getResultSetsBuilderList() {
+    public java.util.List getResultSetsBuilderList() {
       return getResultSetsFieldBuilder().getBuilderList();
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            ResultSet, ResultSet.Builder, ResultSetOrBuilder>
+            com.google.spanner.v1.ResultSet,
+            com.google.spanner.v1.ResultSet.Builder,
+            com.google.spanner.v1.ResultSetOrBuilder>
         getResultSetsFieldBuilder() {
       if (resultSetsBuilder_ == null) {
         resultSetsBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
-                ResultSet, ResultSet.Builder, ResultSetOrBuilder>(
+                com.google.spanner.v1.ResultSet,
+                com.google.spanner.v1.ResultSet.Builder,
+                com.google.spanner.v1.ResultSetOrBuilder>(
                 resultSets_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         resultSets_ = null;
       }
@@ -1286,12 +1315,12 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
       return statusBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1301,19 +1330,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.ExecuteBatchDmlResponse)
-  private static final ExecuteBatchDmlResponse DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.ExecuteBatchDmlResponse DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new ExecuteBatchDmlResponse();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.ExecuteBatchDmlResponse();
   }
 
-  public static ExecuteBatchDmlResponse getDefaultInstance() {
+  public static com.google.spanner.v1.ExecuteBatchDmlResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public ExecuteBatchDmlResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1326,13 +1355,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public ExecuteBatchDmlResponse getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.ExecuteBatchDmlResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponseOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponseOrBuilder.java
index 32f813fdd7..b2891c067a 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponseOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponseOrBuilder.java
@@ -37,7 +37,7 @@ public interface ExecuteBatchDmlResponseOrBuilder
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  java.util.List getResultSetsList();
+  java.util.List getResultSetsList();
   /**
    *
    *
@@ -52,7 +52,7 @@ public interface ExecuteBatchDmlResponseOrBuilder
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  ResultSet getResultSets(int index);
+  com.google.spanner.v1.ResultSet getResultSets(int index);
   /**
    *
    *
@@ -82,7 +82,7 @@ public interface ExecuteBatchDmlResponseOrBuilder
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  java.util.List getResultSetsOrBuilderList();
+  java.util.List getResultSetsOrBuilderList();
   /**
    *
    *
@@ -97,7 +97,7 @@ public interface ExecuteBatchDmlResponseOrBuilder
    *
    * repeated .google.spanner.v1.ResultSet result_sets = 1;
    */
-  ResultSetOrBuilder getResultSetsOrBuilder(int index);
+  com.google.spanner.v1.ResultSetOrBuilder getResultSetsOrBuilder(int index);
 
   /**
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java
index a3f9dbc868..74b7d7aa2e 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java
@@ -77,127 +77,127 @@ private ExecuteSqlRequest(
             done = true;
             break;
           case 10:
-          {
-            java.lang.String s = input.readStringRequireUtf8();
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            session_ = s;
-            break;
-          }
-          case 18:
-          {
-            com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
-            if (transaction_ != null) {
-              subBuilder = transaction_.toBuilder();
-            }
-            transaction_ =
-                input.readMessage(
-                    com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(transaction_);
-              transaction_ = subBuilder.buildPartial();
+              session_ = s;
+              break;
             }
+          case 18:
+            {
+              com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
+              if (transaction_ != null) {
+                subBuilder = transaction_.toBuilder();
+              }
+              transaction_ =
+                  input.readMessage(
+                      com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(transaction_);
+                transaction_ = subBuilder.buildPartial();
+              }
 
-            break;
-          }
+              break;
+            }
           case 26:
-          {
-            java.lang.String s = input.readStringRequireUtf8();
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            sql_ = s;
-            break;
-          }
-          case 34:
-          {
-            com.google.protobuf.Struct.Builder subBuilder = null;
-            if (params_ != null) {
-              subBuilder = params_.toBuilder();
-            }
-            params_ = input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(params_);
-              params_ = subBuilder.buildPartial();
+              sql_ = s;
+              break;
             }
+          case 34:
+            {
+              com.google.protobuf.Struct.Builder subBuilder = null;
+              if (params_ != null) {
+                subBuilder = params_.toBuilder();
+              }
+              params_ = input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(params_);
+                params_ = subBuilder.buildPartial();
+              }
 
-            break;
-          }
+              break;
+            }
           case 42:
-          {
-            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-              paramTypes_ =
-                  com.google.protobuf.MapField.newMapField(
-                      ParamTypesDefaultEntryHolder.defaultEntry);
-              mutable_bitField0_ |= 0x00000001;
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                paramTypes_ =
+                    com.google.protobuf.MapField.newMapField(
+                        ParamTypesDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry
+                  paramTypes__ =
+                      input.readMessage(
+                          ParamTypesDefaultEntryHolder.defaultEntry.getParserForType(),
+                          extensionRegistry);
+              paramTypes_.getMutableMap().put(paramTypes__.getKey(), paramTypes__.getValue());
+              break;
             }
-            com.google.protobuf.MapEntry
-                paramTypes__ =
-                input.readMessage(
-                    ParamTypesDefaultEntryHolder.defaultEntry.getParserForType(),
-                    extensionRegistry);
-            paramTypes_.getMutableMap().put(paramTypes__.getKey(), paramTypes__.getValue());
-            break;
-          }
           case 50:
-          {
-            resumeToken_ = input.readBytes();
-            break;
-          }
+            {
+              resumeToken_ = input.readBytes();
+              break;
+            }
           case 56:
-          {
-            int rawValue = input.readEnum();
+            {
+              int rawValue = input.readEnum();
 
-            queryMode_ = rawValue;
-            break;
-          }
+              queryMode_ = rawValue;
+              break;
+            }
           case 66:
-          {
-            partitionToken_ = input.readBytes();
-            break;
-          }
-          case 72:
-          {
-            seqno_ = input.readInt64();
-            break;
-          }
-          case 82:
-          {
-            com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder subBuilder = null;
-            if (queryOptions_ != null) {
-              subBuilder = queryOptions_.toBuilder();
+            {
+              partitionToken_ = input.readBytes();
+              break;
             }
-            queryOptions_ =
-                input.readMessage(
-                    com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.parser(),
-                    extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(queryOptions_);
-              queryOptions_ = subBuilder.buildPartial();
+          case 72:
+            {
+              seqno_ = input.readInt64();
+              break;
             }
+          case 82:
+            {
+              com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder subBuilder = null;
+              if (queryOptions_ != null) {
+                subBuilder = queryOptions_.toBuilder();
+              }
+              queryOptions_ =
+                  input.readMessage(
+                      com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(queryOptions_);
+                queryOptions_ = subBuilder.buildPartial();
+              }
 
-            break;
-          }
-          case 90:
-          {
-            com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
-            if (requestOptions_ != null) {
-              subBuilder = requestOptions_.toBuilder();
-            }
-            requestOptions_ =
-                input.readMessage(
-                    com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(requestOptions_);
-              requestOptions_ = subBuilder.buildPartial();
+              break;
             }
+          case 90:
+            {
+              com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
+              if (requestOptions_ != null) {
+                subBuilder = requestOptions_.toBuilder();
+              }
+              requestOptions_ =
+                  input.readMessage(
+                      com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(requestOptions_);
+                requestOptions_ = subBuilder.buildPartial();
+              }
 
-            break;
-          }
+              break;
+            }
           default:
-          {
-            if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -228,7 +228,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-  internalGetFieldAccessorTable() {
+      internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto
         .internal_static_google_spanner_v1_ExecuteSqlRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
@@ -570,26 +570,26 @@ private QueryOptions(
               done = true;
               break;
             case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+              {
+                java.lang.String s = input.readStringRequireUtf8();
 
-              optimizerVersion_ = s;
-              break;
-            }
+                optimizerVersion_ = s;
+                break;
+              }
             case 18:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+              {
+                java.lang.String s = input.readStringRequireUtf8();
 
-              optimizerStatisticsPackage_ = s;
-              break;
-            }
+                optimizerStatisticsPackage_ = s;
+                break;
+              }
             default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
               }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -609,7 +609,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internalGetFieldAccessorTable() {
+        internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_ExecuteSqlRequest_QueryOptions_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -973,7 +973,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
+          internalGetFieldAccessorTable() {
         return com.google.spanner.v1.SpannerProto
             .internal_static_google_spanner_v1_ExecuteSqlRequest_QueryOptions_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1788,20 +1788,20 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
   private static final class ParamTypesDefaultEntryHolder {
     static final com.google.protobuf.MapEntry
         defaultEntry =
-        com.google.protobuf.MapEntry
-            .newDefaultInstance(
-                com.google.spanner.v1.SpannerProto
-                    .internal_static_google_spanner_v1_ExecuteSqlRequest_ParamTypesEntry_descriptor,
-                com.google.protobuf.WireFormat.FieldType.STRING,
-                "",
-                com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                com.google.spanner.v1.Type.getDefaultInstance());
+            com.google.protobuf.MapEntry
+                .newDefaultInstance(
+                    com.google.spanner.v1.SpannerProto
+                        .internal_static_google_spanner_v1_ExecuteSqlRequest_ParamTypesEntry_descriptor,
+                    com.google.protobuf.WireFormat.FieldType.STRING,
+                    "",
+                    com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                    com.google.spanner.v1.Type.getDefaultInstance());
   }
 
   private com.google.protobuf.MapField paramTypes_;
 
   private com.google.protobuf.MapField
-  internalGetParamTypes() {
+      internalGetParamTypes() {
     if (paramTypes_ == null) {
       return com.google.protobuf.MapField.emptyMapField(ParamTypesDefaultEntryHolder.defaultEntry);
     }
@@ -2433,7 +2433,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internalGetFieldAccessorTable() {
+        internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_ExecuteSqlRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -2782,9 +2782,9 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
 
     private com.google.spanner.v1.TransactionSelector transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.TransactionSelector,
-        com.google.spanner.v1.TransactionSelector.Builder,
-        com.google.spanner.v1.TransactionSelectorOrBuilder>
+            com.google.spanner.v1.TransactionSelector,
+            com.google.spanner.v1.TransactionSelector.Builder,
+            com.google.spanner.v1.TransactionSelectorOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -3004,10 +3004,10 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.TransactionSelector,
-        com.google.spanner.v1.TransactionSelector.Builder,
-        com.google.spanner.v1.TransactionSelectorOrBuilder>
-    getTransactionFieldBuilder() {
+            com.google.spanner.v1.TransactionSelector,
+            com.google.spanner.v1.TransactionSelector.Builder,
+            com.google.spanner.v1.TransactionSelectorOrBuilder>
+        getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -3128,9 +3128,9 @@ public Builder setSqlBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.Struct params_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Struct,
-        com.google.protobuf.Struct.Builder,
-        com.google.protobuf.StructOrBuilder>
+            com.google.protobuf.Struct,
+            com.google.protobuf.Struct.Builder,
+            com.google.protobuf.StructOrBuilder>
         paramsBuilder_;
     /**
      *
@@ -3360,10 +3360,10 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
      * .google.protobuf.Struct params = 4;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Struct,
-        com.google.protobuf.Struct.Builder,
-        com.google.protobuf.StructOrBuilder>
-    getParamsFieldBuilder() {
+            com.google.protobuf.Struct,
+            com.google.protobuf.Struct.Builder,
+            com.google.protobuf.StructOrBuilder>
+        getParamsFieldBuilder() {
       if (paramsBuilder_ == null) {
         paramsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -3379,7 +3379,7 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
     private com.google.protobuf.MapField paramTypes_;
 
     private com.google.protobuf.MapField
-    internalGetParamTypes() {
+        internalGetParamTypes() {
       if (paramTypes_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             ParamTypesDefaultEntryHolder.defaultEntry);
@@ -3388,7 +3388,7 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
     }
 
     private com.google.protobuf.MapField
-    internalGetMutableParamTypes() {
+        internalGetMutableParamTypes() {
       onChanged();
       ;
       if (paramTypes_ == null) {
@@ -3893,9 +3893,9 @@ public Builder clearSeqno() {
 
     private com.google.spanner.v1.ExecuteSqlRequest.QueryOptions queryOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.ExecuteSqlRequest.QueryOptions,
-        com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder,
-        com.google.spanner.v1.ExecuteSqlRequest.QueryOptionsOrBuilder>
+            com.google.spanner.v1.ExecuteSqlRequest.QueryOptions,
+            com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder,
+            com.google.spanner.v1.ExecuteSqlRequest.QueryOptionsOrBuilder>
         queryOptionsBuilder_;
     /**
      *
@@ -4043,7 +4043,7 @@ public com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder getQueryOpti
      * .google.spanner.v1.ExecuteSqlRequest.QueryOptions query_options = 10;
      */
     public com.google.spanner.v1.ExecuteSqlRequest.QueryOptionsOrBuilder
-    getQueryOptionsOrBuilder() {
+        getQueryOptionsOrBuilder() {
       if (queryOptionsBuilder_ != null) {
         return queryOptionsBuilder_.getMessageOrBuilder();
       } else {
@@ -4062,10 +4062,10 @@ public com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder getQueryOpti
      * .google.spanner.v1.ExecuteSqlRequest.QueryOptions query_options = 10;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.ExecuteSqlRequest.QueryOptions,
-        com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder,
-        com.google.spanner.v1.ExecuteSqlRequest.QueryOptionsOrBuilder>
-    getQueryOptionsFieldBuilder() {
+            com.google.spanner.v1.ExecuteSqlRequest.QueryOptions,
+            com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder,
+            com.google.spanner.v1.ExecuteSqlRequest.QueryOptionsOrBuilder>
+        getQueryOptionsFieldBuilder() {
       if (queryOptionsBuilder_ == null) {
         queryOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -4080,9 +4080,9 @@ public com.google.spanner.v1.ExecuteSqlRequest.QueryOptions.Builder getQueryOpti
 
     private com.google.spanner.v1.RequestOptions requestOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.RequestOptions,
-        com.google.spanner.v1.RequestOptions.Builder,
-        com.google.spanner.v1.RequestOptionsOrBuilder>
+            com.google.spanner.v1.RequestOptions,
+            com.google.spanner.v1.RequestOptions.Builder,
+            com.google.spanner.v1.RequestOptionsOrBuilder>
         requestOptionsBuilder_;
     /**
      *
@@ -4247,10 +4247,10 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder(
      * .google.spanner.v1.RequestOptions request_options = 11;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.RequestOptions,
-        com.google.spanner.v1.RequestOptions.Builder,
-        com.google.spanner.v1.RequestOptionsOrBuilder>
-    getRequestOptionsFieldBuilder() {
+            com.google.spanner.v1.RequestOptions,
+            com.google.spanner.v1.RequestOptions.Builder,
+            com.google.spanner.v1.RequestOptionsOrBuilder>
+        getRequestOptionsFieldBuilder() {
       if (requestOptionsBuilder_ == null) {
         requestOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -4312,4 +4312,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.spanner.v1.ExecuteSqlRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-}
\ No newline at end of file
+}
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequestOrBuilder.java
index 44839300d3..869777efc0 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * @return The session.
    */
-  String getSession();
+  java.lang.String getSession();
   /**
    *
    *
@@ -87,7 +87,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * @return The transaction.
    */
-  TransactionSelector getTransaction();
+  com.google.spanner.v1.TransactionSelector getTransaction();
   /**
    *
    *
@@ -103,7 +103,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * .google.spanner.v1.TransactionSelector transaction = 2;
    */
-  TransactionSelectorOrBuilder getTransactionOrBuilder();
+  com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder();
 
   /**
    *
@@ -116,7 +116,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * @return The sql.
    */
-  String getSql();
+  java.lang.String getSql();
   /**
    *
    *
@@ -220,10 +220,10 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  boolean containsParamTypes(String key);
+  boolean containsParamTypes(java.lang.String key);
   /** Use {@link #getParamTypesMap()} instead. */
-  @Deprecated
-  java.util.Map getParamTypes();
+  @java.lang.Deprecated
+  java.util.Map getParamTypes();
   /**
    *
    *
@@ -239,7 +239,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  java.util.Map getParamTypesMap();
+  java.util.Map getParamTypesMap();
   /**
    *
    *
@@ -255,7 +255,8 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  Type getParamTypesOrDefault(String key, Type defaultValue);
+  com.google.spanner.v1.Type getParamTypesOrDefault(
+      java.lang.String key, com.google.spanner.v1.Type defaultValue);
   /**
    *
    *
@@ -271,7 +272,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  Type getParamTypesOrThrow(String key);
+  com.google.spanner.v1.Type getParamTypesOrThrow(java.lang.String key);
 
   /**
    *
@@ -318,7 +319,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * @return The queryMode.
    */
-  ExecuteSqlRequest.QueryMode getQueryMode();
+  com.google.spanner.v1.ExecuteSqlRequest.QueryMode getQueryMode();
 
   /**
    *
@@ -379,7 +380,7 @@ public interface ExecuteSqlRequestOrBuilder
    *
    * @return The queryOptions.
    */
-  ExecuteSqlRequest.QueryOptions getQueryOptions();
+  com.google.spanner.v1.ExecuteSqlRequest.QueryOptions getQueryOptions();
   /**
    *
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java
index bc2e223383..e8c23cb150 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java
@@ -41,13 +41,13 @@ private GetSessionRequest() {
     name_ = "";
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetSessionRequest();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private GetSessionRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -72,7 +72,7 @@ private GetSessionRequest(
             break;
           case 10:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               name_ = s;
               break;
@@ -97,17 +97,22 @@ private GetSessionRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_GetSessionRequest_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(GetSessionRequest.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_GetSessionRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.GetSessionRequest.class,
+            com.google.spanner.v1.GetSessionRequest.Builder.class);
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile Object name_;
+  private volatile java.lang.Object name_;
   /**
    *
    *
@@ -121,14 +126,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return The name.
    */
-  @Override
-  public String getName() {
-    Object ref = name_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  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;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       name_ = s;
       return s;
     }
@@ -146,11 +151,12 @@ public String getName() {
    *
    * @return The bytes for name.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getNameBytes() {
-    Object ref = name_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    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 {
@@ -160,7 +166,7 @@ public com.google.protobuf.ByteString getNameBytes() {
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -170,7 +176,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
@@ -178,7 +184,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -192,22 +198,22 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof GetSessionRequest)) {
+    if (!(obj instanceof com.google.spanner.v1.GetSessionRequest)) {
       return super.equals(obj);
     }
-    GetSessionRequest other = (GetSessionRequest) obj;
+    com.google.spanner.v1.GetSessionRequest other = (com.google.spanner.v1.GetSessionRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -221,69 +227,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static GetSessionRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.GetSessionRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static GetSessionRequest parseFrom(
+  public static com.google.spanner.v1.GetSessionRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static GetSessionRequest parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.GetSessionRequest parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static GetSessionRequest parseFrom(
+  public static com.google.spanner.v1.GetSessionRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static GetSessionRequest parseFrom(byte[] data)
+  public static com.google.spanner.v1.GetSessionRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static GetSessionRequest parseFrom(
+  public static com.google.spanner.v1.GetSessionRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static GetSessionRequest parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.GetSessionRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static GetSessionRequest parseFrom(
+  public static com.google.spanner.v1.GetSessionRequest 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 GetSessionRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.GetSessionRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static GetSessionRequest parseDelimitedFrom(
+  public static com.google.spanner.v1.GetSessionRequest 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 GetSessionRequest parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.GetSessionRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static GetSessionRequest parseFrom(
+  public static com.google.spanner.v1.GetSessionRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -291,7 +299,7 @@ public static GetSessionRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -300,17 +308,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(GetSessionRequest prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.GetSessionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -326,15 +334,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.GetSessionRequest)
-      GetSessionRequestOrBuilder {
+      com.google.spanner.v1.GetSessionRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_GetSessionRequest_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(GetSessionRequest.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_GetSessionRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.GetSessionRequest.class,
+              com.google.spanner.v1.GetSessionRequest.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.GetSessionRequest.newBuilder()
@@ -342,7 +355,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -351,7 +364,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -359,77 +372,80 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_GetSessionRequest_descriptor;
     }
 
-    @Override
-    public GetSessionRequest getDefaultInstanceForType() {
-      return GetSessionRequest.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.GetSessionRequest getDefaultInstanceForType() {
+      return com.google.spanner.v1.GetSessionRequest.getDefaultInstance();
     }
 
-    @Override
-    public GetSessionRequest build() {
-      GetSessionRequest result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.GetSessionRequest build() {
+      com.google.spanner.v1.GetSessionRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public GetSessionRequest buildPartial() {
-      GetSessionRequest result = new GetSessionRequest(this);
+    @java.lang.Override
+    public com.google.spanner.v1.GetSessionRequest buildPartial() {
+      com.google.spanner.v1.GetSessionRequest result =
+          new com.google.spanner.v1.GetSessionRequest(this);
       result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof GetSessionRequest) {
-        return mergeFrom((GetSessionRequest) other);
+      if (other instanceof com.google.spanner.v1.GetSessionRequest) {
+        return mergeFrom((com.google.spanner.v1.GetSessionRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(GetSessionRequest other) {
-      if (other == GetSessionRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.GetSessionRequest other) {
+      if (other == com.google.spanner.v1.GetSessionRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
         onChanged();
@@ -439,21 +455,21 @@ public Builder mergeFrom(GetSessionRequest other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      GetSessionRequest parsedMessage = null;
+      com.google.spanner.v1.GetSessionRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (GetSessionRequest) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.GetSessionRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -463,7 +479,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private Object name_ = "";
+    private java.lang.Object name_ = "";
     /**
      *
      *
@@ -477,15 +493,15 @@ public Builder mergeFrom(
      *
      * @return The name.
      */
-    public String getName() {
-      Object ref = name_;
-      if (!(ref instanceof String)) {
+    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;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         name_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -502,10 +518,10 @@ public String getName() {
      * @return The bytes for name.
      */
     public com.google.protobuf.ByteString getNameBytes() {
-      Object ref = name_;
+      java.lang.Object ref = name_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         name_ = b;
         return b;
       } else {
@@ -526,7 +542,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      * @param value The name to set.
      * @return This builder for chaining.
      */
-    public Builder setName(String value) {
+    public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -579,12 +595,12 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -594,19 +610,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.GetSessionRequest)
-  private static final GetSessionRequest DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.GetSessionRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new GetSessionRequest();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.GetSessionRequest();
   }
 
-  public static GetSessionRequest getDefaultInstance() {
+  public static com.google.spanner.v1.GetSessionRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public GetSessionRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -619,13 +635,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public GetSessionRequest getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.GetSessionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequestOrBuilder.java
index 3ca7b53c69..811caaed11 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface GetSessionRequestOrBuilder
    *
    * @return The name.
    */
-  String getName();
+  java.lang.String getName();
   /**
    *
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java
index fecb675217..31eeafed84 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java
@@ -99,13 +99,13 @@ private KeyRange(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
   private KeyRange() {}
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new KeyRange();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -116,7 +116,7 @@ private KeyRange(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -208,19 +208,25 @@ private KeyRange(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
+    return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return KeysProto.internal_static_google_spanner_v1_KeyRange_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(KeyRange.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.KeysProto
+        .internal_static_google_spanner_v1_KeyRange_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.KeyRange.class, com.google.spanner.v1.KeyRange.Builder.class);
   }
 
   private int startKeyTypeCase_ = 0;
-  private Object startKeyType_;
+  private java.lang.Object startKeyType_;
 
-  public enum StartKeyTypeCase implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
+  public enum StartKeyTypeCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     START_CLOSED(1),
     START_OPEN(2),
     STARTKEYTYPE_NOT_SET(0);
@@ -234,7 +240,7 @@ private StartKeyTypeCase(int value) {
      * @return The enum associated with the given number.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @Deprecated
+    @java.lang.Deprecated
     public static StartKeyTypeCase valueOf(int value) {
       return forNumber(value);
     }
@@ -262,9 +268,12 @@ public StartKeyTypeCase getStartKeyTypeCase() {
   }
 
   private int endKeyTypeCase_ = 0;
-  private Object endKeyType_;
+  private java.lang.Object endKeyType_;
 
-  public enum EndKeyTypeCase implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
+  public enum EndKeyTypeCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     END_CLOSED(3),
     END_OPEN(4),
     ENDKEYTYPE_NOT_SET(0);
@@ -278,7 +287,7 @@ private EndKeyTypeCase(int value) {
      * @return The enum associated with the given number.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @Deprecated
+    @java.lang.Deprecated
     public static EndKeyTypeCase valueOf(int value) {
       return forNumber(value);
     }
@@ -318,7 +327,7 @@ public EndKeyTypeCase getEndKeyTypeCase() {
    *
    * @return Whether the startClosed field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasStartClosed() {
     return startKeyTypeCase_ == 1;
   }
@@ -334,7 +343,7 @@ public boolean hasStartClosed() {
    *
    * @return The startClosed.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ListValue getStartClosed() {
     if (startKeyTypeCase_ == 1) {
       return (com.google.protobuf.ListValue) startKeyType_;
@@ -351,7 +360,7 @@ public com.google.protobuf.ListValue getStartClosed() {
    *
    * .google.protobuf.ListValue start_closed = 1;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ListValueOrBuilder getStartClosedOrBuilder() {
     if (startKeyTypeCase_ == 1) {
       return (com.google.protobuf.ListValue) startKeyType_;
@@ -372,7 +381,7 @@ public com.google.protobuf.ListValueOrBuilder getStartClosedOrBuilder() {
    *
    * @return Whether the startOpen field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasStartOpen() {
     return startKeyTypeCase_ == 2;
   }
@@ -388,7 +397,7 @@ public boolean hasStartOpen() {
    *
    * @return The startOpen.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ListValue getStartOpen() {
     if (startKeyTypeCase_ == 2) {
       return (com.google.protobuf.ListValue) startKeyType_;
@@ -405,7 +414,7 @@ public com.google.protobuf.ListValue getStartOpen() {
    *
    * .google.protobuf.ListValue start_open = 2;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ListValueOrBuilder getStartOpenOrBuilder() {
     if (startKeyTypeCase_ == 2) {
       return (com.google.protobuf.ListValue) startKeyType_;
@@ -426,7 +435,7 @@ public com.google.protobuf.ListValueOrBuilder getStartOpenOrBuilder() {
    *
    * @return Whether the endClosed field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasEndClosed() {
     return endKeyTypeCase_ == 3;
   }
@@ -442,7 +451,7 @@ public boolean hasEndClosed() {
    *
    * @return The endClosed.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ListValue getEndClosed() {
     if (endKeyTypeCase_ == 3) {
       return (com.google.protobuf.ListValue) endKeyType_;
@@ -459,7 +468,7 @@ public com.google.protobuf.ListValue getEndClosed() {
    *
    * .google.protobuf.ListValue end_closed = 3;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ListValueOrBuilder getEndClosedOrBuilder() {
     if (endKeyTypeCase_ == 3) {
       return (com.google.protobuf.ListValue) endKeyType_;
@@ -480,7 +489,7 @@ public com.google.protobuf.ListValueOrBuilder getEndClosedOrBuilder() {
    *
    * @return Whether the endOpen field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasEndOpen() {
     return endKeyTypeCase_ == 4;
   }
@@ -496,7 +505,7 @@ public boolean hasEndOpen() {
    *
    * @return The endOpen.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ListValue getEndOpen() {
     if (endKeyTypeCase_ == 4) {
       return (com.google.protobuf.ListValue) endKeyType_;
@@ -513,7 +522,7 @@ public com.google.protobuf.ListValue getEndOpen() {
    *
    * .google.protobuf.ListValue end_open = 4;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ListValueOrBuilder getEndOpenOrBuilder() {
     if (endKeyTypeCase_ == 4) {
       return (com.google.protobuf.ListValue) endKeyType_;
@@ -523,7 +532,7 @@ public com.google.protobuf.ListValueOrBuilder getEndOpenOrBuilder() {
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -533,7 +542,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (startKeyTypeCase_ == 1) {
       output.writeMessage(1, (com.google.protobuf.ListValue) startKeyType_);
@@ -550,7 +559,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -581,15 +590,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof KeyRange)) {
+    if (!(obj instanceof com.google.spanner.v1.KeyRange)) {
       return super.equals(obj);
     }
-    KeyRange other = (KeyRange) obj;
+    com.google.spanner.v1.KeyRange other = (com.google.spanner.v1.KeyRange) obj;
 
     if (!getStartKeyTypeCase().equals(other.getStartKeyTypeCase())) return false;
     switch (startKeyTypeCase_) {
@@ -617,7 +626,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -653,68 +662,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static KeyRange parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.KeyRange parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static KeyRange parseFrom(
+  public static com.google.spanner.v1.KeyRange parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static KeyRange parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.KeyRange parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static KeyRange parseFrom(
+  public static com.google.spanner.v1.KeyRange parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static KeyRange parseFrom(byte[] data)
+  public static com.google.spanner.v1.KeyRange parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static KeyRange parseFrom(
+  public static com.google.spanner.v1.KeyRange parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static KeyRange parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.KeyRange parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static KeyRange parseFrom(
+  public static com.google.spanner.v1.KeyRange 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 KeyRange parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.KeyRange parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static KeyRange parseDelimitedFrom(
+  public static com.google.spanner.v1.KeyRange 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 KeyRange parseFrom(com.google.protobuf.CodedInputStream input)
+  public static com.google.spanner.v1.KeyRange parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static KeyRange parseFrom(
+  public static com.google.spanner.v1.KeyRange parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -722,7 +733,7 @@ public static KeyRange parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -731,17 +742,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(KeyRange prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.KeyRange prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -817,15 +828,18 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.KeyRange)
-      KeyRangeOrBuilder {
+      com.google.spanner.v1.KeyRangeOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
+      return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return KeysProto.internal_static_google_spanner_v1_KeyRange_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(KeyRange.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.KeysProto
+          .internal_static_google_spanner_v1_KeyRange_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.KeyRange.class, com.google.spanner.v1.KeyRange.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.KeyRange.newBuilder()
@@ -833,7 +847,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -842,7 +856,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       startKeyTypeCase_ = 0;
@@ -852,28 +866,28 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
+      return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
     }
 
-    @Override
-    public KeyRange getDefaultInstanceForType() {
-      return KeyRange.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.KeyRange getDefaultInstanceForType() {
+      return com.google.spanner.v1.KeyRange.getDefaultInstance();
     }
 
-    @Override
-    public KeyRange build() {
-      KeyRange result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.KeyRange build() {
+      com.google.spanner.v1.KeyRange result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public KeyRange buildPartial() {
-      KeyRange result = new KeyRange(this);
+    @java.lang.Override
+    public com.google.spanner.v1.KeyRange buildPartial() {
+      com.google.spanner.v1.KeyRange result = new com.google.spanner.v1.KeyRange(this);
       if (startKeyTypeCase_ == 1) {
         if (startClosedBuilder_ == null) {
           result.startKeyType_ = startKeyType_;
@@ -908,50 +922,51 @@ public KeyRange buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof KeyRange) {
-        return mergeFrom((KeyRange) other);
+      if (other instanceof com.google.spanner.v1.KeyRange) {
+        return mergeFrom((com.google.spanner.v1.KeyRange) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(KeyRange other) {
-      if (other == KeyRange.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.KeyRange other) {
+      if (other == com.google.spanner.v1.KeyRange.getDefaultInstance()) return this;
       switch (other.getStartKeyTypeCase()) {
         case START_CLOSED:
           {
@@ -989,21 +1004,21 @@ public Builder mergeFrom(KeyRange other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      KeyRange parsedMessage = null;
+      com.google.spanner.v1.KeyRange parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (KeyRange) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.KeyRange) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -1014,7 +1029,7 @@ public Builder mergeFrom(
     }
 
     private int startKeyTypeCase_ = 0;
-    private Object startKeyType_;
+    private java.lang.Object startKeyType_;
 
     public StartKeyTypeCase getStartKeyTypeCase() {
       return StartKeyTypeCase.forNumber(startKeyTypeCase_);
@@ -1028,7 +1043,7 @@ public Builder clearStartKeyType() {
     }
 
     private int endKeyTypeCase_ = 0;
-    private Object endKeyType_;
+    private java.lang.Object endKeyType_;
 
     public EndKeyTypeCase getEndKeyTypeCase() {
       return EndKeyTypeCase.forNumber(endKeyTypeCase_);
@@ -1058,7 +1073,7 @@ public Builder clearEndKeyType() {
      *
      * @return Whether the startClosed field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasStartClosed() {
       return startKeyTypeCase_ == 1;
     }
@@ -1074,7 +1089,7 @@ public boolean hasStartClosed() {
      *
      * @return The startClosed.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ListValue getStartClosed() {
       if (startClosedBuilder_ == null) {
         if (startKeyTypeCase_ == 1) {
@@ -1212,7 +1227,7 @@ public com.google.protobuf.ListValue.Builder getStartClosedBuilder() {
      *
      * .google.protobuf.ListValue start_closed = 1;
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ListValueOrBuilder getStartClosedOrBuilder() {
       if ((startKeyTypeCase_ == 1) && (startClosedBuilder_ != null)) {
         return startClosedBuilder_.getMessageOrBuilder();
@@ -1273,7 +1288,7 @@ public com.google.protobuf.ListValueOrBuilder getStartClosedOrBuilder() {
      *
      * @return Whether the startOpen field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasStartOpen() {
       return startKeyTypeCase_ == 2;
     }
@@ -1289,7 +1304,7 @@ public boolean hasStartOpen() {
      *
      * @return The startOpen.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ListValue getStartOpen() {
       if (startOpenBuilder_ == null) {
         if (startKeyTypeCase_ == 2) {
@@ -1427,7 +1442,7 @@ public com.google.protobuf.ListValue.Builder getStartOpenBuilder() {
      *
      * .google.protobuf.ListValue start_open = 2;
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ListValueOrBuilder getStartOpenOrBuilder() {
       if ((startKeyTypeCase_ == 2) && (startOpenBuilder_ != null)) {
         return startOpenBuilder_.getMessageOrBuilder();
@@ -1488,7 +1503,7 @@ public com.google.protobuf.ListValueOrBuilder getStartOpenOrBuilder() {
      *
      * @return Whether the endClosed field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasEndClosed() {
       return endKeyTypeCase_ == 3;
     }
@@ -1504,7 +1519,7 @@ public boolean hasEndClosed() {
      *
      * @return The endClosed.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ListValue getEndClosed() {
       if (endClosedBuilder_ == null) {
         if (endKeyTypeCase_ == 3) {
@@ -1641,7 +1656,7 @@ public com.google.protobuf.ListValue.Builder getEndClosedBuilder() {
      *
      * .google.protobuf.ListValue end_closed = 3;
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ListValueOrBuilder getEndClosedOrBuilder() {
       if ((endKeyTypeCase_ == 3) && (endClosedBuilder_ != null)) {
         return endClosedBuilder_.getMessageOrBuilder();
@@ -1702,7 +1717,7 @@ public com.google.protobuf.ListValueOrBuilder getEndClosedOrBuilder() {
      *
      * @return Whether the endOpen field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasEndOpen() {
       return endKeyTypeCase_ == 4;
     }
@@ -1718,7 +1733,7 @@ public boolean hasEndOpen() {
      *
      * @return The endOpen.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ListValue getEndOpen() {
       if (endOpenBuilder_ == null) {
         if (endKeyTypeCase_ == 4) {
@@ -1855,7 +1870,7 @@ public com.google.protobuf.ListValue.Builder getEndOpenBuilder() {
      *
      * .google.protobuf.ListValue end_open = 4;
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ListValueOrBuilder getEndOpenOrBuilder() {
       if ((endKeyTypeCase_ == 4) && (endOpenBuilder_ != null)) {
         return endOpenBuilder_.getMessageOrBuilder();
@@ -1899,12 +1914,12 @@ public com.google.protobuf.ListValueOrBuilder getEndOpenOrBuilder() {
       return endOpenBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1914,19 +1929,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.KeyRange)
-  private static final KeyRange DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.KeyRange DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new KeyRange();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.KeyRange();
   }
 
-  public static KeyRange getDefaultInstance() {
+  public static com.google.spanner.v1.KeyRange getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public KeyRange parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1939,13 +1954,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public KeyRange getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.KeyRange getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRangeOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRangeOrBuilder.java
index dca2b33c9a..c6a5e89496 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRangeOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRangeOrBuilder.java
@@ -175,7 +175,7 @@ public interface KeyRangeOrBuilder
    */
   com.google.protobuf.ListValueOrBuilder getEndOpenOrBuilder();
 
-  public KeyRange.StartKeyTypeCase getStartKeyTypeCase();
+  public com.google.spanner.v1.KeyRange.StartKeyTypeCase getStartKeyTypeCase();
 
-  public KeyRange.EndKeyTypeCase getEndKeyTypeCase();
+  public com.google.spanner.v1.KeyRange.EndKeyTypeCase getEndKeyTypeCase();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java
index f42a7201a0..c9cc35fa86 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java
@@ -47,13 +47,13 @@ private KeySet() {
     ranges_ = java.util.Collections.emptyList();
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new KeySet();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -64,7 +64,7 @@ private KeySet(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -90,10 +90,11 @@ private KeySet(
           case 18:
             {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                ranges_ = new java.util.ArrayList();
+                ranges_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              ranges_.add(input.readMessage(KeyRange.parser(), extensionRegistry));
+              ranges_.add(
+                  input.readMessage(com.google.spanner.v1.KeyRange.parser(), extensionRegistry));
               break;
             }
           case 24:
@@ -127,13 +128,16 @@ private KeySet(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
+    return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return KeysProto.internal_static_google_spanner_v1_KeySet_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(KeySet.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.KeysProto
+        .internal_static_google_spanner_v1_KeySet_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.KeySet.class, com.google.spanner.v1.KeySet.Builder.class);
   }
 
   public static final int KEYS_FIELD_NUMBER = 1;
@@ -150,7 +154,7 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * repeated .google.protobuf.ListValue keys = 1;
    */
-  @Override
+  @java.lang.Override
   public java.util.List getKeysList() {
     return keys_;
   }
@@ -166,7 +170,7 @@ public java.util.List getKeysList() {
    *
    * repeated .google.protobuf.ListValue keys = 1;
    */
-  @Override
+  @java.lang.Override
   public java.util.List getKeysOrBuilderList() {
     return keys_;
   }
@@ -182,7 +186,7 @@ public java.util.List getKeysO
    *
    * repeated .google.protobuf.ListValue keys = 1;
    */
-  @Override
+  @java.lang.Override
   public int getKeysCount() {
     return keys_.size();
   }
@@ -198,7 +202,7 @@ public int getKeysCount() {
    *
    * repeated .google.protobuf.ListValue keys = 1;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ListValue getKeys(int index) {
     return keys_.get(index);
   }
@@ -214,13 +218,13 @@ public com.google.protobuf.ListValue getKeys(int index) {
    *
    * repeated .google.protobuf.ListValue keys = 1;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ListValueOrBuilder getKeysOrBuilder(int index) {
     return keys_.get(index);
   }
 
   public static final int RANGES_FIELD_NUMBER = 2;
-  private java.util.List ranges_;
+  private java.util.List ranges_;
   /**
    *
    *
@@ -231,8 +235,8 @@ public com.google.protobuf.ListValueOrBuilder getKeysOrBuilder(int index) {
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  @Override
-  public java.util.List getRangesList() {
+  @java.lang.Override
+  public java.util.List getRangesList() {
     return ranges_;
   }
   /**
@@ -245,8 +249,9 @@ public java.util.List getRangesList() {
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  @Override
-  public java.util.List getRangesOrBuilderList() {
+  @java.lang.Override
+  public java.util.List
+      getRangesOrBuilderList() {
     return ranges_;
   }
   /**
@@ -259,7 +264,7 @@ public java.util.List getRangesOrBuilderList() {
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  @Override
+  @java.lang.Override
   public int getRangesCount() {
     return ranges_.size();
   }
@@ -273,8 +278,8 @@ public int getRangesCount() {
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  @Override
-  public KeyRange getRanges(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.KeyRange getRanges(int index) {
     return ranges_.get(index);
   }
   /**
@@ -287,8 +292,8 @@ public KeyRange getRanges(int index) {
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  @Override
-  public KeyRangeOrBuilder getRangesOrBuilder(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.KeyRangeOrBuilder getRangesOrBuilder(int index) {
     return ranges_.get(index);
   }
 
@@ -307,14 +312,14 @@ public KeyRangeOrBuilder getRangesOrBuilder(int index) {
    *
    * @return The all.
    */
-  @Override
+  @java.lang.Override
   public boolean getAll() {
     return all_;
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -324,7 +329,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < keys_.size(); i++) {
       output.writeMessage(1, keys_.get(i));
@@ -338,7 +343,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -358,15 +363,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof KeySet)) {
+    if (!(obj instanceof com.google.spanner.v1.KeySet)) {
       return super.equals(obj);
     }
-    KeySet other = (KeySet) obj;
+    com.google.spanner.v1.KeySet other = (com.google.spanner.v1.KeySet) obj;
 
     if (!getKeysList().equals(other.getKeysList())) return false;
     if (!getRangesList().equals(other.getRangesList())) return false;
@@ -375,7 +380,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -397,68 +402,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static KeySet parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.KeySet parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static KeySet parseFrom(
+  public static com.google.spanner.v1.KeySet parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static KeySet parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.KeySet parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static KeySet parseFrom(
+  public static com.google.spanner.v1.KeySet parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static KeySet parseFrom(byte[] data)
+  public static com.google.spanner.v1.KeySet parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static KeySet parseFrom(
+  public static com.google.spanner.v1.KeySet parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static KeySet parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.KeySet parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static KeySet parseFrom(
+  public static com.google.spanner.v1.KeySet 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 KeySet parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.KeySet parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static KeySet parseDelimitedFrom(
+  public static com.google.spanner.v1.KeySet 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 KeySet parseFrom(com.google.protobuf.CodedInputStream input)
+  public static com.google.spanner.v1.KeySet parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static KeySet parseFrom(
+  public static com.google.spanner.v1.KeySet parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -466,7 +473,7 @@ public static KeySet parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -475,17 +482,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(KeySet prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.KeySet prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -506,15 +513,18 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.KeySet)
-      KeySetOrBuilder {
+      com.google.spanner.v1.KeySetOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
+      return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return KeysProto.internal_static_google_spanner_v1_KeySet_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(KeySet.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.KeysProto
+          .internal_static_google_spanner_v1_KeySet_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.KeySet.class, com.google.spanner.v1.KeySet.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.KeySet.newBuilder()
@@ -522,7 +532,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -534,7 +544,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (keysBuilder_ == null) {
@@ -554,28 +564,28 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
+      return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
     }
 
-    @Override
-    public KeySet getDefaultInstanceForType() {
-      return KeySet.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.KeySet getDefaultInstanceForType() {
+      return com.google.spanner.v1.KeySet.getDefaultInstance();
     }
 
-    @Override
-    public KeySet build() {
-      KeySet result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.KeySet build() {
+      com.google.spanner.v1.KeySet result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public KeySet buildPartial() {
-      KeySet result = new KeySet(this);
+    @java.lang.Override
+    public com.google.spanner.v1.KeySet buildPartial() {
+      com.google.spanner.v1.KeySet result = new com.google.spanner.v1.KeySet(this);
       int from_bitField0_ = bitField0_;
       if (keysBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -600,50 +610,51 @@ public KeySet buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof KeySet) {
-        return mergeFrom((KeySet) other);
+      if (other instanceof com.google.spanner.v1.KeySet) {
+        return mergeFrom((com.google.spanner.v1.KeySet) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(KeySet other) {
-      if (other == KeySet.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.KeySet other) {
+      if (other == com.google.spanner.v1.KeySet.getDefaultInstance()) return this;
       if (keysBuilder_ == null) {
         if (!other.keys_.isEmpty()) {
           if (keys_.isEmpty()) {
@@ -706,21 +717,21 @@ public Builder mergeFrom(KeySet other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      KeySet parsedMessage = null;
+      com.google.spanner.v1.KeySet parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (KeySet) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.KeySet) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -957,7 +968,7 @@ public Builder addKeys(int index, com.google.protobuf.ListValue.Builder builderF
      *
      * repeated .google.protobuf.ListValue keys = 1;
      */
-    public Builder addAllKeys(Iterable values) {
+    public Builder addAllKeys(java.lang.Iterable values) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, keys_);
@@ -1128,17 +1139,20 @@ public java.util.List getKeysBuilderList(
       return keysBuilder_;
     }
 
-    private java.util.List ranges_ = java.util.Collections.emptyList();
+    private java.util.List ranges_ =
+        java.util.Collections.emptyList();
 
     private void ensureRangesIsMutable() {
       if (!((bitField0_ & 0x00000002) != 0)) {
-        ranges_ = new java.util.ArrayList(ranges_);
+        ranges_ = new java.util.ArrayList(ranges_);
         bitField0_ |= 0x00000002;
       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            KeyRange, KeyRange.Builder, KeyRangeOrBuilder>
+            com.google.spanner.v1.KeyRange,
+            com.google.spanner.v1.KeyRange.Builder,
+            com.google.spanner.v1.KeyRangeOrBuilder>
         rangesBuilder_;
 
     /**
@@ -1151,7 +1165,7 @@ private void ensureRangesIsMutable() {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public java.util.List getRangesList() {
+    public java.util.List getRangesList() {
       if (rangesBuilder_ == null) {
         return java.util.Collections.unmodifiableList(ranges_);
       } else {
@@ -1185,7 +1199,7 @@ public int getRangesCount() {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public KeyRange getRanges(int index) {
+    public com.google.spanner.v1.KeyRange getRanges(int index) {
       if (rangesBuilder_ == null) {
         return ranges_.get(index);
       } else {
@@ -1202,7 +1216,7 @@ public KeyRange getRanges(int index) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder setRanges(int index, KeyRange value) {
+    public Builder setRanges(int index, com.google.spanner.v1.KeyRange value) {
       if (rangesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1225,7 +1239,7 @@ public Builder setRanges(int index, KeyRange value) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder setRanges(int index, KeyRange.Builder builderForValue) {
+    public Builder setRanges(int index, com.google.spanner.v1.KeyRange.Builder builderForValue) {
       if (rangesBuilder_ == null) {
         ensureRangesIsMutable();
         ranges_.set(index, builderForValue.build());
@@ -1245,7 +1259,7 @@ public Builder setRanges(int index, KeyRange.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder addRanges(KeyRange value) {
+    public Builder addRanges(com.google.spanner.v1.KeyRange value) {
       if (rangesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1268,7 +1282,7 @@ public Builder addRanges(KeyRange value) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder addRanges(int index, KeyRange value) {
+    public Builder addRanges(int index, com.google.spanner.v1.KeyRange value) {
       if (rangesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1291,7 +1305,7 @@ public Builder addRanges(int index, KeyRange value) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder addRanges(KeyRange.Builder builderForValue) {
+    public Builder addRanges(com.google.spanner.v1.KeyRange.Builder builderForValue) {
       if (rangesBuilder_ == null) {
         ensureRangesIsMutable();
         ranges_.add(builderForValue.build());
@@ -1311,7 +1325,7 @@ public Builder addRanges(KeyRange.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder addRanges(int index, KeyRange.Builder builderForValue) {
+    public Builder addRanges(int index, com.google.spanner.v1.KeyRange.Builder builderForValue) {
       if (rangesBuilder_ == null) {
         ensureRangesIsMutable();
         ranges_.add(index, builderForValue.build());
@@ -1331,7 +1345,8 @@ public Builder addRanges(int index, KeyRange.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public Builder addAllRanges(Iterable values) {
+    public Builder addAllRanges(
+        java.lang.Iterable values) {
       if (rangesBuilder_ == null) {
         ensureRangesIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, ranges_);
@@ -1391,7 +1406,7 @@ public Builder removeRanges(int index) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public KeyRange.Builder getRangesBuilder(int index) {
+    public com.google.spanner.v1.KeyRange.Builder getRangesBuilder(int index) {
       return getRangesFieldBuilder().getBuilder(index);
     }
     /**
@@ -1404,7 +1419,7 @@ public KeyRange.Builder getRangesBuilder(int index) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public KeyRangeOrBuilder getRangesOrBuilder(int index) {
+    public com.google.spanner.v1.KeyRangeOrBuilder getRangesOrBuilder(int index) {
       if (rangesBuilder_ == null) {
         return ranges_.get(index);
       } else {
@@ -1421,7 +1436,8 @@ public KeyRangeOrBuilder getRangesOrBuilder(int index) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public java.util.List getRangesOrBuilderList() {
+    public java.util.List
+        getRangesOrBuilderList() {
       if (rangesBuilder_ != null) {
         return rangesBuilder_.getMessageOrBuilderList();
       } else {
@@ -1438,8 +1454,9 @@ public java.util.List getRangesOrBuilderList() {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public KeyRange.Builder addRangesBuilder() {
-      return getRangesFieldBuilder().addBuilder(KeyRange.getDefaultInstance());
+    public com.google.spanner.v1.KeyRange.Builder addRangesBuilder() {
+      return getRangesFieldBuilder()
+          .addBuilder(com.google.spanner.v1.KeyRange.getDefaultInstance());
     }
     /**
      *
@@ -1451,8 +1468,9 @@ public KeyRange.Builder addRangesBuilder() {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public KeyRange.Builder addRangesBuilder(int index) {
-      return getRangesFieldBuilder().addBuilder(index, KeyRange.getDefaultInstance());
+    public com.google.spanner.v1.KeyRange.Builder addRangesBuilder(int index) {
+      return getRangesFieldBuilder()
+          .addBuilder(index, com.google.spanner.v1.KeyRange.getDefaultInstance());
     }
     /**
      *
@@ -1464,17 +1482,21 @@ public KeyRange.Builder addRangesBuilder(int index) {
      *
      * repeated .google.spanner.v1.KeyRange ranges = 2;
      */
-    public java.util.List getRangesBuilderList() {
+    public java.util.List getRangesBuilderList() {
       return getRangesFieldBuilder().getBuilderList();
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            KeyRange, KeyRange.Builder, KeyRangeOrBuilder>
+            com.google.spanner.v1.KeyRange,
+            com.google.spanner.v1.KeyRange.Builder,
+            com.google.spanner.v1.KeyRangeOrBuilder>
         getRangesFieldBuilder() {
       if (rangesBuilder_ == null) {
         rangesBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
-                KeyRange, KeyRange.Builder, KeyRangeOrBuilder>(
+                com.google.spanner.v1.KeyRange,
+                com.google.spanner.v1.KeyRange.Builder,
+                com.google.spanner.v1.KeyRangeOrBuilder>(
                 ranges_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         ranges_ = null;
       }
@@ -1495,7 +1517,7 @@ public java.util.List getRangesBuilderList() {
      *
      * @return The all.
      */
-    @Override
+    @java.lang.Override
     public boolean getAll() {
       return all_;
     }
@@ -1539,12 +1561,12 @@ public Builder clearAll() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1554,19 +1576,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.KeySet)
-  private static final KeySet DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.KeySet DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new KeySet();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.KeySet();
   }
 
-  public static KeySet getDefaultInstance() {
+  public static com.google.spanner.v1.KeySet getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public KeySet parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1579,13 +1601,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public KeySet getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.KeySet getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySetOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySetOrBuilder.java
index c7bf48e932..7ff32d6843 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySetOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySetOrBuilder.java
@@ -99,7 +99,7 @@ public interface KeySetOrBuilder
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  java.util.List getRangesList();
+  java.util.List getRangesList();
   /**
    *
    *
@@ -110,7 +110,7 @@ public interface KeySetOrBuilder
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  KeyRange getRanges(int index);
+  com.google.spanner.v1.KeyRange getRanges(int index);
   /**
    *
    *
@@ -132,7 +132,7 @@ public interface KeySetOrBuilder
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  java.util.List getRangesOrBuilderList();
+  java.util.List getRangesOrBuilderList();
   /**
    *
    *
@@ -143,7 +143,7 @@ public interface KeySetOrBuilder
    *
    * repeated .google.spanner.v1.KeyRange ranges = 2;
    */
-  KeyRangeOrBuilder getRangesOrBuilder(int index);
+  com.google.spanner.v1.KeyRangeOrBuilder getRangesOrBuilder(int index);
 
   /**
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java
index 298a03a0db..9c9b6318d1 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java
@@ -43,7 +43,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
   static {
-    String[] descriptorData = {
+    java.lang.String[] descriptorData = {
       "\n\034google/spanner/v1/keys.proto\022\021google.s"
           + "panner.v1\032\034google/protobuf/struct.proto\032"
           + "\034google/api/annotations.proto\"\364\001\n\010KeyRan"
@@ -74,14 +74,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_KeyRange_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_KeyRange_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "StartClosed", "StartOpen", "EndClosed", "EndOpen", "StartKeyType", "EndKeyType",
             });
     internal_static_google_spanner_v1_KeySet_descriptor = getDescriptor().getMessageTypes().get(1);
     internal_static_google_spanner_v1_KeySet_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_KeySet_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Keys", "Ranges", "All",
             });
     com.google.protobuf.StructProto.getDescriptor();
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java
index 4a5ec2be39..6d39079533 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java
@@ -43,13 +43,13 @@ private ListSessionsRequest() {
     filter_ = "";
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListSessionsRequest();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -60,7 +60,7 @@ private ListSessionsRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -74,7 +74,7 @@ private ListSessionsRequest(
             break;
           case 10:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               database_ = s;
               break;
@@ -86,14 +86,14 @@ private ListSessionsRequest(
             }
           case 26:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               pageToken_ = s;
               break;
             }
           case 34:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               filter_ = s;
               break;
@@ -118,17 +118,22 @@ private ListSessionsRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(ListSessionsRequest.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_ListSessionsRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.ListSessionsRequest.class,
+            com.google.spanner.v1.ListSessionsRequest.Builder.class);
   }
 
   public static final int DATABASE_FIELD_NUMBER = 1;
-  private volatile Object database_;
+  private volatile java.lang.Object database_;
   /**
    *
    *
@@ -142,14 +147,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return The database.
    */
-  @Override
-  public String getDatabase() {
-    Object ref = database_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  public java.lang.String getDatabase() {
+    java.lang.Object ref = database_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       database_ = s;
       return s;
     }
@@ -167,11 +172,12 @@ public String getDatabase() {
    *
    * @return The bytes for database.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getDatabaseBytes() {
-    Object ref = database_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    java.lang.Object ref = database_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       database_ = b;
       return b;
     } else {
@@ -193,13 +199,13 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
    *
    * @return The pageSize.
    */
-  @Override
+  @java.lang.Override
   public int getPageSize() {
     return pageSize_;
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile Object pageToken_;
+  private volatile java.lang.Object pageToken_;
   /**
    *
    *
@@ -213,14 +219,14 @@ public int getPageSize() {
    *
    * @return The pageToken.
    */
-  @Override
-  public String getPageToken() {
-    Object ref = pageToken_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  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;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       pageToken_ = s;
       return s;
     }
@@ -238,11 +244,12 @@ public String getPageToken() {
    *
    * @return The bytes for pageToken.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getPageTokenBytes() {
-    Object ref = pageToken_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    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 {
@@ -251,7 +258,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
-  private volatile Object filter_;
+  private volatile java.lang.Object filter_;
   /**
    *
    *
@@ -269,14 +276,14 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
    *
    * @return The filter.
    */
-  @Override
-  public String getFilter() {
-    Object ref = filter_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  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;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       filter_ = s;
       return s;
     }
@@ -298,11 +305,12 @@ public String getFilter() {
    *
    * @return The bytes for filter.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getFilterBytes() {
-    Object ref = filter_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    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 {
@@ -312,7 +320,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -322,7 +330,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, database_);
@@ -339,7 +347,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -362,15 +370,16 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof ListSessionsRequest)) {
+    if (!(obj instanceof com.google.spanner.v1.ListSessionsRequest)) {
       return super.equals(obj);
     }
-    ListSessionsRequest other = (ListSessionsRequest) obj;
+    com.google.spanner.v1.ListSessionsRequest other =
+        (com.google.spanner.v1.ListSessionsRequest) obj;
 
     if (!getDatabase().equals(other.getDatabase())) return false;
     if (getPageSize() != other.getPageSize()) return false;
@@ -380,7 +389,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -400,70 +409,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static ListSessionsRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.ListSessionsRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ListSessionsRequest parseFrom(
+  public static com.google.spanner.v1.ListSessionsRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ListSessionsRequest parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.ListSessionsRequest parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ListSessionsRequest parseFrom(
+  public static com.google.spanner.v1.ListSessionsRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ListSessionsRequest parseFrom(byte[] data)
+  public static com.google.spanner.v1.ListSessionsRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ListSessionsRequest parseFrom(
+  public static com.google.spanner.v1.ListSessionsRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ListSessionsRequest parseFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.ListSessionsRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static ListSessionsRequest parseFrom(
+  public static com.google.spanner.v1.ListSessionsRequest 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 ListSessionsRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.ListSessionsRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static ListSessionsRequest parseDelimitedFrom(
+  public static com.google.spanner.v1.ListSessionsRequest 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 ListSessionsRequest parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.ListSessionsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static ListSessionsRequest parseFrom(
+  public static com.google.spanner.v1.ListSessionsRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -471,7 +481,7 @@ public static ListSessionsRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -480,17 +490,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(ListSessionsRequest prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.ListSessionsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -506,15 +516,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.ListSessionsRequest)
-      ListSessionsRequestOrBuilder {
+      com.google.spanner.v1.ListSessionsRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(ListSessionsRequest.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_ListSessionsRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.ListSessionsRequest.class,
+              com.google.spanner.v1.ListSessionsRequest.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.ListSessionsRequest.newBuilder()
@@ -522,7 +537,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -531,7 +546,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -545,28 +560,30 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
     }
 
-    @Override
-    public ListSessionsRequest getDefaultInstanceForType() {
-      return ListSessionsRequest.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.ListSessionsRequest getDefaultInstanceForType() {
+      return com.google.spanner.v1.ListSessionsRequest.getDefaultInstance();
     }
 
-    @Override
-    public ListSessionsRequest build() {
-      ListSessionsRequest result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.ListSessionsRequest build() {
+      com.google.spanner.v1.ListSessionsRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public ListSessionsRequest buildPartial() {
-      ListSessionsRequest result = new ListSessionsRequest(this);
+    @java.lang.Override
+    public com.google.spanner.v1.ListSessionsRequest buildPartial() {
+      com.google.spanner.v1.ListSessionsRequest result =
+          new com.google.spanner.v1.ListSessionsRequest(this);
       result.database_ = database_;
       result.pageSize_ = pageSize_;
       result.pageToken_ = pageToken_;
@@ -575,50 +592,51 @@ public ListSessionsRequest buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof ListSessionsRequest) {
-        return mergeFrom((ListSessionsRequest) other);
+      if (other instanceof com.google.spanner.v1.ListSessionsRequest) {
+        return mergeFrom((com.google.spanner.v1.ListSessionsRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(ListSessionsRequest other) {
-      if (other == ListSessionsRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.ListSessionsRequest other) {
+      if (other == com.google.spanner.v1.ListSessionsRequest.getDefaultInstance()) return this;
       if (!other.getDatabase().isEmpty()) {
         database_ = other.database_;
         onChanged();
@@ -639,21 +657,21 @@ public Builder mergeFrom(ListSessionsRequest other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      ListSessionsRequest parsedMessage = null;
+      com.google.spanner.v1.ListSessionsRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (ListSessionsRequest) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.ListSessionsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -663,7 +681,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private Object database_ = "";
+    private java.lang.Object database_ = "";
     /**
      *
      *
@@ -677,15 +695,15 @@ public Builder mergeFrom(
      *
      * @return The database.
      */
-    public String getDatabase() {
-      Object ref = database_;
-      if (!(ref instanceof String)) {
+    public java.lang.String getDatabase() {
+      java.lang.Object ref = database_;
+      if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         database_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -702,10 +720,10 @@ public String getDatabase() {
      * @return The bytes for database.
      */
     public com.google.protobuf.ByteString getDatabaseBytes() {
-      Object ref = database_;
+      java.lang.Object ref = database_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         database_ = b;
         return b;
       } else {
@@ -726,7 +744,7 @@ public com.google.protobuf.ByteString getDatabaseBytes() {
      * @param value The database to set.
      * @return This builder for chaining.
      */
-    public Builder setDatabase(String value) {
+    public Builder setDatabase(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -792,7 +810,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) {
      *
      * @return The pageSize.
      */
-    @Override
+    @java.lang.Override
     public int getPageSize() {
       return pageSize_;
     }
@@ -834,7 +852,7 @@ public Builder clearPageSize() {
       return this;
     }
 
-    private Object pageToken_ = "";
+    private java.lang.Object pageToken_ = "";
     /**
      *
      *
@@ -848,15 +866,15 @@ public Builder clearPageSize() {
      *
      * @return The pageToken.
      */
-    public String getPageToken() {
-      Object ref = pageToken_;
-      if (!(ref instanceof String)) {
+    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;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         pageToken_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -873,10 +891,10 @@ public String getPageToken() {
      * @return The bytes for pageToken.
      */
     public com.google.protobuf.ByteString getPageTokenBytes() {
-      Object ref = pageToken_;
+      java.lang.Object ref = pageToken_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         pageToken_ = b;
         return b;
       } else {
@@ -897,7 +915,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      * @param value The pageToken to set.
      * @return This builder for chaining.
      */
-    public Builder setPageToken(String value) {
+    public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -950,7 +968,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private Object filter_ = "";
+    private java.lang.Object filter_ = "";
     /**
      *
      *
@@ -968,15 +986,15 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
      *
      * @return The filter.
      */
-    public String getFilter() {
-      Object ref = filter_;
-      if (!(ref instanceof String)) {
+    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;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         filter_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -997,10 +1015,10 @@ public String getFilter() {
      * @return The bytes for filter.
      */
     public com.google.protobuf.ByteString getFilterBytes() {
-      Object ref = filter_;
+      java.lang.Object ref = filter_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         filter_ = b;
         return b;
       } else {
@@ -1025,7 +1043,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
      * @param value The filter to set.
      * @return This builder for chaining.
      */
-    public Builder setFilter(String value) {
+    public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1086,12 +1104,12 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1101,19 +1119,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.ListSessionsRequest)
-  private static final ListSessionsRequest DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.ListSessionsRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new ListSessionsRequest();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.ListSessionsRequest();
   }
 
-  public static ListSessionsRequest getDefaultInstance() {
+  public static com.google.spanner.v1.ListSessionsRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public ListSessionsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1126,13 +1144,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public ListSessionsRequest getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.ListSessionsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequestOrBuilder.java
index 26854aa672..98c63809bb 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface ListSessionsRequestOrBuilder
    *
    * @return The database.
    */
-  String getDatabase();
+  java.lang.String getDatabase();
   /**
    *
    *
@@ -79,7 +79,7 @@ public interface ListSessionsRequestOrBuilder
    *
    * @return The pageToken.
    */
-  String getPageToken();
+  java.lang.String getPageToken();
   /**
    *
    *
@@ -112,7 +112,7 @@ public interface ListSessionsRequestOrBuilder
    *
    * @return The filter.
    */
-  String getFilter();
+  java.lang.String getFilter();
   /**
    *
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java
index d8f7dd248a..6e7f0627e5 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java
@@ -42,13 +42,13 @@ private ListSessionsResponse() {
     nextPageToken_ = "";
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListSessionsResponse();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private ListSessionsResponse(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -75,15 +75,16 @@ private ListSessionsResponse(
           case 10:
             {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                sessions_ = new java.util.ArrayList();
+                sessions_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              sessions_.add(input.readMessage(Session.parser(), extensionRegistry));
+              sessions_.add(
+                  input.readMessage(com.google.spanner.v1.Session.parser(), extensionRegistry));
               break;
             }
           case 18:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               nextPageToken_ = s;
               break;
@@ -111,17 +112,22 @@ private ListSessionsResponse(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(ListSessionsResponse.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_ListSessionsResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.ListSessionsResponse.class,
+            com.google.spanner.v1.ListSessionsResponse.Builder.class);
   }
 
   public static final int SESSIONS_FIELD_NUMBER = 1;
-  private java.util.List sessions_;
+  private java.util.List sessions_;
   /**
    *
    *
@@ -131,8 +137,8 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  @Override
-  public java.util.List getSessionsList() {
+  @java.lang.Override
+  public java.util.List getSessionsList() {
     return sessions_;
   }
   /**
@@ -144,8 +150,9 @@ public java.util.List getSessionsList() {
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  @Override
-  public java.util.List getSessionsOrBuilderList() {
+  @java.lang.Override
+  public java.util.List
+      getSessionsOrBuilderList() {
     return sessions_;
   }
   /**
@@ -157,7 +164,7 @@ public java.util.List getSessionsOrBuilderList() {
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  @Override
+  @java.lang.Override
   public int getSessionsCount() {
     return sessions_.size();
   }
@@ -170,8 +177,8 @@ public int getSessionsCount() {
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  @Override
-  public Session getSessions(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.Session getSessions(int index) {
     return sessions_.get(index);
   }
   /**
@@ -183,13 +190,13 @@ public Session getSessions(int index) {
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  @Override
-  public SessionOrBuilder getSessionsOrBuilder(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.SessionOrBuilder getSessionsOrBuilder(int index) {
     return sessions_.get(index);
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile Object nextPageToken_;
+  private volatile java.lang.Object nextPageToken_;
   /**
    *
    *
@@ -203,14 +210,14 @@ public SessionOrBuilder getSessionsOrBuilder(int index) {
    *
    * @return The nextPageToken.
    */
-  @Override
-  public String getNextPageToken() {
-    Object ref = nextPageToken_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  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;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       nextPageToken_ = s;
       return s;
     }
@@ -228,11 +235,12 @@ public String getNextPageToken() {
    *
    * @return The bytes for nextPageToken.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getNextPageTokenBytes() {
-    Object ref = nextPageToken_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    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 {
@@ -242,7 +250,7 @@ public com.google.protobuf.ByteString getNextPageTokenBytes() {
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -252,7 +260,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < sessions_.size(); i++) {
       output.writeMessage(1, sessions_.get(i));
@@ -263,7 +271,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -280,15 +288,16 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof ListSessionsResponse)) {
+    if (!(obj instanceof com.google.spanner.v1.ListSessionsResponse)) {
       return super.equals(obj);
     }
-    ListSessionsResponse other = (ListSessionsResponse) obj;
+    com.google.spanner.v1.ListSessionsResponse other =
+        (com.google.spanner.v1.ListSessionsResponse) obj;
 
     if (!getSessionsList().equals(other.getSessionsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
@@ -296,7 +305,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -314,70 +323,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static ListSessionsResponse parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.ListSessionsResponse parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ListSessionsResponse parseFrom(
+  public static com.google.spanner.v1.ListSessionsResponse parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ListSessionsResponse parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.ListSessionsResponse parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ListSessionsResponse parseFrom(
+  public static com.google.spanner.v1.ListSessionsResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ListSessionsResponse parseFrom(byte[] data)
+  public static com.google.spanner.v1.ListSessionsResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ListSessionsResponse parseFrom(
+  public static com.google.spanner.v1.ListSessionsResponse parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ListSessionsResponse parseFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.ListSessionsResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static ListSessionsResponse parseFrom(
+  public static com.google.spanner.v1.ListSessionsResponse 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 ListSessionsResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.ListSessionsResponse parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static ListSessionsResponse parseDelimitedFrom(
+  public static com.google.spanner.v1.ListSessionsResponse 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 ListSessionsResponse parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.ListSessionsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static ListSessionsResponse parseFrom(
+  public static com.google.spanner.v1.ListSessionsResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -385,7 +395,7 @@ public static ListSessionsResponse parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -394,17 +404,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(ListSessionsResponse prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.ListSessionsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -420,15 +430,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.ListSessionsResponse)
-      ListSessionsResponseOrBuilder {
+      com.google.spanner.v1.ListSessionsResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(ListSessionsResponse.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_ListSessionsResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.ListSessionsResponse.class,
+              com.google.spanner.v1.ListSessionsResponse.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.ListSessionsResponse.newBuilder()
@@ -436,7 +451,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -447,7 +462,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (sessionsBuilder_ == null) {
@@ -461,28 +476,30 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
     }
 
-    @Override
-    public ListSessionsResponse getDefaultInstanceForType() {
-      return ListSessionsResponse.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.ListSessionsResponse getDefaultInstanceForType() {
+      return com.google.spanner.v1.ListSessionsResponse.getDefaultInstance();
     }
 
-    @Override
-    public ListSessionsResponse build() {
-      ListSessionsResponse result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.ListSessionsResponse build() {
+      com.google.spanner.v1.ListSessionsResponse result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public ListSessionsResponse buildPartial() {
-      ListSessionsResponse result = new ListSessionsResponse(this);
+    @java.lang.Override
+    public com.google.spanner.v1.ListSessionsResponse buildPartial() {
+      com.google.spanner.v1.ListSessionsResponse result =
+          new com.google.spanner.v1.ListSessionsResponse(this);
       int from_bitField0_ = bitField0_;
       if (sessionsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -498,50 +515,51 @@ public ListSessionsResponse buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof ListSessionsResponse) {
-        return mergeFrom((ListSessionsResponse) other);
+      if (other instanceof com.google.spanner.v1.ListSessionsResponse) {
+        return mergeFrom((com.google.spanner.v1.ListSessionsResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(ListSessionsResponse other) {
-      if (other == ListSessionsResponse.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.ListSessionsResponse other) {
+      if (other == com.google.spanner.v1.ListSessionsResponse.getDefaultInstance()) return this;
       if (sessionsBuilder_ == null) {
         if (!other.sessions_.isEmpty()) {
           if (sessions_.isEmpty()) {
@@ -578,21 +596,21 @@ public Builder mergeFrom(ListSessionsResponse other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      ListSessionsResponse parsedMessage = null;
+      com.google.spanner.v1.ListSessionsResponse parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (ListSessionsResponse) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.ListSessionsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -604,16 +622,20 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.util.List sessions_ = java.util.Collections.emptyList();
+    private java.util.List sessions_ =
+        java.util.Collections.emptyList();
 
     private void ensureSessionsIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        sessions_ = new java.util.ArrayList(sessions_);
+        sessions_ = new java.util.ArrayList(sessions_);
         bitField0_ |= 0x00000001;
       }
     }
 
-    private com.google.protobuf.RepeatedFieldBuilderV3
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.spanner.v1.Session,
+            com.google.spanner.v1.Session.Builder,
+            com.google.spanner.v1.SessionOrBuilder>
         sessionsBuilder_;
 
     /**
@@ -625,7 +647,7 @@ private void ensureSessionsIsMutable() {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public java.util.List getSessionsList() {
+    public java.util.List getSessionsList() {
       if (sessionsBuilder_ == null) {
         return java.util.Collections.unmodifiableList(sessions_);
       } else {
@@ -657,7 +679,7 @@ public int getSessionsCount() {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Session getSessions(int index) {
+    public com.google.spanner.v1.Session getSessions(int index) {
       if (sessionsBuilder_ == null) {
         return sessions_.get(index);
       } else {
@@ -673,7 +695,7 @@ public Session getSessions(int index) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder setSessions(int index, Session value) {
+    public Builder setSessions(int index, com.google.spanner.v1.Session value) {
       if (sessionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -695,7 +717,7 @@ public Builder setSessions(int index, Session value) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder setSessions(int index, Session.Builder builderForValue) {
+    public Builder setSessions(int index, com.google.spanner.v1.Session.Builder builderForValue) {
       if (sessionsBuilder_ == null) {
         ensureSessionsIsMutable();
         sessions_.set(index, builderForValue.build());
@@ -714,7 +736,7 @@ public Builder setSessions(int index, Session.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder addSessions(Session value) {
+    public Builder addSessions(com.google.spanner.v1.Session value) {
       if (sessionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -736,7 +758,7 @@ public Builder addSessions(Session value) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder addSessions(int index, Session value) {
+    public Builder addSessions(int index, com.google.spanner.v1.Session value) {
       if (sessionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -758,7 +780,7 @@ public Builder addSessions(int index, Session value) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder addSessions(Session.Builder builderForValue) {
+    public Builder addSessions(com.google.spanner.v1.Session.Builder builderForValue) {
       if (sessionsBuilder_ == null) {
         ensureSessionsIsMutable();
         sessions_.add(builderForValue.build());
@@ -777,7 +799,7 @@ public Builder addSessions(Session.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder addSessions(int index, Session.Builder builderForValue) {
+    public Builder addSessions(int index, com.google.spanner.v1.Session.Builder builderForValue) {
       if (sessionsBuilder_ == null) {
         ensureSessionsIsMutable();
         sessions_.add(index, builderForValue.build());
@@ -796,7 +818,8 @@ public Builder addSessions(int index, Session.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Builder addAllSessions(Iterable values) {
+    public Builder addAllSessions(
+        java.lang.Iterable values) {
       if (sessionsBuilder_ == null) {
         ensureSessionsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, sessions_);
@@ -853,7 +876,7 @@ public Builder removeSessions(int index) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Session.Builder getSessionsBuilder(int index) {
+    public com.google.spanner.v1.Session.Builder getSessionsBuilder(int index) {
       return getSessionsFieldBuilder().getBuilder(index);
     }
     /**
@@ -865,7 +888,7 @@ public Session.Builder getSessionsBuilder(int index) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public SessionOrBuilder getSessionsOrBuilder(int index) {
+    public com.google.spanner.v1.SessionOrBuilder getSessionsOrBuilder(int index) {
       if (sessionsBuilder_ == null) {
         return sessions_.get(index);
       } else {
@@ -881,7 +904,8 @@ public SessionOrBuilder getSessionsOrBuilder(int index) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public java.util.List getSessionsOrBuilderList() {
+    public java.util.List
+        getSessionsOrBuilderList() {
       if (sessionsBuilder_ != null) {
         return sessionsBuilder_.getMessageOrBuilderList();
       } else {
@@ -897,8 +921,9 @@ public java.util.List getSessionsOrBuilderList() {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Session.Builder addSessionsBuilder() {
-      return getSessionsFieldBuilder().addBuilder(Session.getDefaultInstance());
+    public com.google.spanner.v1.Session.Builder addSessionsBuilder() {
+      return getSessionsFieldBuilder()
+          .addBuilder(com.google.spanner.v1.Session.getDefaultInstance());
     }
     /**
      *
@@ -909,8 +934,9 @@ public Session.Builder addSessionsBuilder() {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public Session.Builder addSessionsBuilder(int index) {
-      return getSessionsFieldBuilder().addBuilder(index, Session.getDefaultInstance());
+    public com.google.spanner.v1.Session.Builder addSessionsBuilder(int index) {
+      return getSessionsFieldBuilder()
+          .addBuilder(index, com.google.spanner.v1.Session.getDefaultInstance());
     }
     /**
      *
@@ -921,23 +947,28 @@ public Session.Builder addSessionsBuilder(int index) {
      *
      * repeated .google.spanner.v1.Session sessions = 1;
      */
-    public java.util.List getSessionsBuilderList() {
+    public java.util.List getSessionsBuilderList() {
       return getSessionsFieldBuilder().getBuilderList();
     }
 
-    private com.google.protobuf.RepeatedFieldBuilderV3
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.spanner.v1.Session,
+            com.google.spanner.v1.Session.Builder,
+            com.google.spanner.v1.SessionOrBuilder>
         getSessionsFieldBuilder() {
       if (sessionsBuilder_ == null) {
         sessionsBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
-                Session, Session.Builder, SessionOrBuilder>(
+                com.google.spanner.v1.Session,
+                com.google.spanner.v1.Session.Builder,
+                com.google.spanner.v1.SessionOrBuilder>(
                 sessions_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         sessions_ = null;
       }
       return sessionsBuilder_;
     }
 
-    private Object nextPageToken_ = "";
+    private java.lang.Object nextPageToken_ = "";
     /**
      *
      *
@@ -951,15 +982,15 @@ public java.util.List getSessionsBuilderList() {
      *
      * @return The nextPageToken.
      */
-    public String getNextPageToken() {
-      Object ref = nextPageToken_;
-      if (!(ref instanceof String)) {
+    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;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         nextPageToken_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -976,10 +1007,10 @@ public String getNextPageToken() {
      * @return The bytes for nextPageToken.
      */
     public com.google.protobuf.ByteString getNextPageTokenBytes() {
-      Object ref = nextPageToken_;
+      java.lang.Object ref = nextPageToken_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         nextPageToken_ = b;
         return b;
       } else {
@@ -1000,7 +1031,7 @@ public com.google.protobuf.ByteString getNextPageTokenBytes() {
      * @param value The nextPageToken to set.
      * @return This builder for chaining.
      */
-    public Builder setNextPageToken(String value) {
+    public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1053,12 +1084,12 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1068,19 +1099,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.ListSessionsResponse)
-  private static final ListSessionsResponse DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.ListSessionsResponse DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new ListSessionsResponse();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.ListSessionsResponse();
   }
 
-  public static ListSessionsResponse getDefaultInstance() {
+  public static com.google.spanner.v1.ListSessionsResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public ListSessionsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1093,13 +1124,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public ListSessionsResponse getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.ListSessionsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponseOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponseOrBuilder.java
index 06b753ed10..3f42309cc3 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponseOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponseOrBuilder.java
@@ -32,7 +32,7 @@ public interface ListSessionsResponseOrBuilder
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  java.util.List getSessionsList();
+  java.util.List getSessionsList();
   /**
    *
    *
@@ -42,7 +42,7 @@ public interface ListSessionsResponseOrBuilder
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  Session getSessions(int index);
+  com.google.spanner.v1.Session getSessions(int index);
   /**
    *
    *
@@ -62,7 +62,7 @@ public interface ListSessionsResponseOrBuilder
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  java.util.List getSessionsOrBuilderList();
+  java.util.List getSessionsOrBuilderList();
   /**
    *
    *
@@ -72,7 +72,7 @@ public interface ListSessionsResponseOrBuilder
    *
    * repeated .google.spanner.v1.Session sessions = 1;
    */
-  SessionOrBuilder getSessionsOrBuilder(int index);
+  com.google.spanner.v1.SessionOrBuilder getSessionsOrBuilder(int index);
 
   /**
    *
@@ -87,7 +87,7 @@ public interface ListSessionsResponseOrBuilder
    *
    * @return The nextPageToken.
    */
-  String getNextPageToken();
+  java.lang.String getNextPageToken();
   /**
    *
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java
index 3fabf13d2c..8d3222c5ee 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java
@@ -41,13 +41,13 @@ private Mutation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
   private Mutation() {}
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Mutation();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private Mutation(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -72,13 +72,15 @@ private Mutation(
             break;
           case 10:
             {
-              Write.Builder subBuilder = null;
+              com.google.spanner.v1.Mutation.Write.Builder subBuilder = null;
               if (operationCase_ == 1) {
-                subBuilder = ((Write) operation_).toBuilder();
+                subBuilder = ((com.google.spanner.v1.Mutation.Write) operation_).toBuilder();
               }
-              operation_ = input.readMessage(Write.parser(), extensionRegistry);
+              operation_ =
+                  input.readMessage(
+                      com.google.spanner.v1.Mutation.Write.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((Write) operation_);
+                subBuilder.mergeFrom((com.google.spanner.v1.Mutation.Write) operation_);
                 operation_ = subBuilder.buildPartial();
               }
               operationCase_ = 1;
@@ -86,13 +88,15 @@ private Mutation(
             }
           case 18:
             {
-              Write.Builder subBuilder = null;
+              com.google.spanner.v1.Mutation.Write.Builder subBuilder = null;
               if (operationCase_ == 2) {
-                subBuilder = ((Write) operation_).toBuilder();
+                subBuilder = ((com.google.spanner.v1.Mutation.Write) operation_).toBuilder();
               }
-              operation_ = input.readMessage(Write.parser(), extensionRegistry);
+              operation_ =
+                  input.readMessage(
+                      com.google.spanner.v1.Mutation.Write.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((Write) operation_);
+                subBuilder.mergeFrom((com.google.spanner.v1.Mutation.Write) operation_);
                 operation_ = subBuilder.buildPartial();
               }
               operationCase_ = 2;
@@ -100,13 +104,15 @@ private Mutation(
             }
           case 26:
             {
-              Write.Builder subBuilder = null;
+              com.google.spanner.v1.Mutation.Write.Builder subBuilder = null;
               if (operationCase_ == 3) {
-                subBuilder = ((Write) operation_).toBuilder();
+                subBuilder = ((com.google.spanner.v1.Mutation.Write) operation_).toBuilder();
               }
-              operation_ = input.readMessage(Write.parser(), extensionRegistry);
+              operation_ =
+                  input.readMessage(
+                      com.google.spanner.v1.Mutation.Write.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((Write) operation_);
+                subBuilder.mergeFrom((com.google.spanner.v1.Mutation.Write) operation_);
                 operation_ = subBuilder.buildPartial();
               }
               operationCase_ = 3;
@@ -114,13 +120,15 @@ private Mutation(
             }
           case 34:
             {
-              Write.Builder subBuilder = null;
+              com.google.spanner.v1.Mutation.Write.Builder subBuilder = null;
               if (operationCase_ == 4) {
-                subBuilder = ((Write) operation_).toBuilder();
+                subBuilder = ((com.google.spanner.v1.Mutation.Write) operation_).toBuilder();
               }
-              operation_ = input.readMessage(Write.parser(), extensionRegistry);
+              operation_ =
+                  input.readMessage(
+                      com.google.spanner.v1.Mutation.Write.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((Write) operation_);
+                subBuilder.mergeFrom((com.google.spanner.v1.Mutation.Write) operation_);
                 operation_ = subBuilder.buildPartial();
               }
               operationCase_ = 4;
@@ -128,13 +136,15 @@ private Mutation(
             }
           case 42:
             {
-              Delete.Builder subBuilder = null;
+              com.google.spanner.v1.Mutation.Delete.Builder subBuilder = null;
               if (operationCase_ == 5) {
-                subBuilder = ((Delete) operation_).toBuilder();
+                subBuilder = ((com.google.spanner.v1.Mutation.Delete) operation_).toBuilder();
               }
-              operation_ = input.readMessage(Delete.parser(), extensionRegistry);
+              operation_ =
+                  input.readMessage(
+                      com.google.spanner.v1.Mutation.Delete.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((Delete) operation_);
+                subBuilder.mergeFrom((com.google.spanner.v1.Mutation.Delete) operation_);
                 operation_ = subBuilder.buildPartial();
               }
               operationCase_ = 5;
@@ -160,13 +170,17 @@ private Mutation(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return MutationProto.internal_static_google_spanner_v1_Mutation_descriptor;
+    return com.google.spanner.v1.MutationProto
+        .internal_static_google_spanner_v1_Mutation_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return MutationProto.internal_static_google_spanner_v1_Mutation_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(Mutation.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.MutationProto
+        .internal_static_google_spanner_v1_Mutation_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.Mutation.class, com.google.spanner.v1.Mutation.Builder.class);
   }
 
   public interface WriteOrBuilder
@@ -185,7 +199,7 @@ public interface WriteOrBuilder
      *
      * @return The table.
      */
-    String getTable();
+    java.lang.String getTable();
     /**
      *
      *
@@ -213,7 +227,7 @@ public interface WriteOrBuilder
      *
      * @return A list containing the columns.
      */
-    java.util.List getColumnsList();
+    java.util.List getColumnsList();
     /**
      *
      *
@@ -244,7 +258,7 @@ public interface WriteOrBuilder
      * @param index The index of the element to return.
      * @return The columns at the given index.
      */
-    String getColumns(int index);
+    java.lang.String getColumns(int index);
     /**
      *
      *
@@ -374,13 +388,13 @@ private Write() {
       values_ = java.util.Collections.emptyList();
     }
 
-    @Override
+    @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Write();
     }
 
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -391,7 +405,7 @@ private Write(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -406,14 +420,14 @@ private Write(
               break;
             case 10:
               {
-                String s = input.readStringRequireUtf8();
+                java.lang.String s = input.readStringRequireUtf8();
 
                 table_ = s;
                 break;
               }
             case 18:
               {
-                String s = input.readStringRequireUtf8();
+                java.lang.String s = input.readStringRequireUtf8();
                 if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                   columns_ = new com.google.protobuf.LazyStringArrayList();
                   mutable_bitField0_ |= 0x00000001;
@@ -457,17 +471,22 @@ private Write(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return MutationProto.internal_static_google_spanner_v1_Mutation_Write_descriptor;
+      return com.google.spanner.v1.MutationProto
+          .internal_static_google_spanner_v1_Mutation_Write_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return MutationProto.internal_static_google_spanner_v1_Mutation_Write_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(Write.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.MutationProto
+          .internal_static_google_spanner_v1_Mutation_Write_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.Mutation.Write.class,
+              com.google.spanner.v1.Mutation.Write.Builder.class);
     }
 
     public static final int TABLE_FIELD_NUMBER = 1;
-    private volatile Object table_;
+    private volatile java.lang.Object table_;
     /**
      *
      *
@@ -479,14 +498,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
      *
      * @return The table.
      */
-    @Override
-    public String getTable() {
-      Object ref = table_;
-      if (ref instanceof String) {
-        return (String) ref;
+    @java.lang.Override
+    public java.lang.String getTable() {
+      java.lang.Object ref = table_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         table_ = s;
         return s;
       }
@@ -502,12 +521,12 @@ public String getTable() {
      *
      * @return The bytes for table.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ByteString getTableBytes() {
-      Object ref = table_;
-      if (ref instanceof String) {
+      java.lang.Object ref = table_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         table_ = b;
         return b;
       } else {
@@ -566,7 +585,7 @@ public int getColumnsCount() {
      * @param index The index of the element to return.
      * @return The columns at the given index.
      */
-    public String getColumns(int index) {
+    public java.lang.String getColumns(int index) {
       return columns_.get(index);
     }
     /**
@@ -606,7 +625,7 @@ public com.google.protobuf.ByteString getColumnsBytes(int index) {
      *
      * repeated .google.protobuf.ListValue values = 3;
      */
-    @Override
+    @java.lang.Override
     public java.util.List getValuesList() {
       return values_;
     }
@@ -626,7 +645,7 @@ public java.util.List getValuesList() {
      *
      * repeated .google.protobuf.ListValue values = 3;
      */
-    @Override
+    @java.lang.Override
     public java.util.List
         getValuesOrBuilderList() {
       return values_;
@@ -647,7 +666,7 @@ public java.util.List getValuesList() {
      *
      * repeated .google.protobuf.ListValue values = 3;
      */
-    @Override
+    @java.lang.Override
     public int getValuesCount() {
       return values_.size();
     }
@@ -667,7 +686,7 @@ public int getValuesCount() {
      *
      * repeated .google.protobuf.ListValue values = 3;
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ListValue getValues(int index) {
       return values_.get(index);
     }
@@ -687,14 +706,14 @@ public com.google.protobuf.ListValue getValues(int index) {
      *
      * repeated .google.protobuf.ListValue values = 3;
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ListValueOrBuilder getValuesOrBuilder(int index) {
       return values_.get(index);
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -704,7 +723,7 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (!getTableBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, table_);
@@ -718,7 +737,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       unknownFields.writeTo(output);
     }
 
-    @Override
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -743,15 +762,15 @@ public int getSerializedSize() {
       return size;
     }
 
-    @Override
-    public boolean equals(final Object obj) {
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof Write)) {
+      if (!(obj instanceof com.google.spanner.v1.Mutation.Write)) {
         return super.equals(obj);
       }
-      Write other = (Write) obj;
+      com.google.spanner.v1.Mutation.Write other = (com.google.spanner.v1.Mutation.Write) obj;
 
       if (!getTable().equals(other.getTable())) return false;
       if (!getColumnsList().equals(other.getColumnsList())) return false;
@@ -760,7 +779,7 @@ public boolean equals(final Object obj) {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -782,68 +801,71 @@ public int hashCode() {
       return hash;
     }
 
-    public static Write parseFrom(java.nio.ByteBuffer data)
+    public static com.google.spanner.v1.Mutation.Write parseFrom(java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static Write parseFrom(
+    public static com.google.spanner.v1.Mutation.Write parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static Write parseFrom(com.google.protobuf.ByteString data)
+    public static com.google.spanner.v1.Mutation.Write parseFrom(
+        com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static Write parseFrom(
+    public static com.google.spanner.v1.Mutation.Write parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static Write parseFrom(byte[] data)
+    public static com.google.spanner.v1.Mutation.Write parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static Write parseFrom(
+    public static com.google.spanner.v1.Mutation.Write parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static Write parseFrom(java.io.InputStream input) throws java.io.IOException {
+    public static com.google.spanner.v1.Mutation.Write parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static Write parseFrom(
+    public static com.google.spanner.v1.Mutation.Write 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 Write parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+    public static com.google.spanner.v1.Mutation.Write parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static Write parseDelimitedFrom(
+    public static com.google.spanner.v1.Mutation.Write 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 Write parseFrom(com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.Mutation.Write parseFrom(
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static Write parseFrom(
+    public static com.google.spanner.v1.Mutation.Write parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -851,7 +873,7 @@ public static Write parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @Override
+    @java.lang.Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -860,17 +882,18 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(Write prototype) {
+    public static Builder newBuilder(com.google.spanner.v1.Mutation.Write prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @Override
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
     }
 
-    @Override
-    protected Builder newBuilderForType(BuilderParent parent) {
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -888,15 +911,20 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.Mutation.Write)
-        WriteOrBuilder {
+        com.google.spanner.v1.Mutation.WriteOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return MutationProto.internal_static_google_spanner_v1_Mutation_Write_descriptor;
+        return com.google.spanner.v1.MutationProto
+            .internal_static_google_spanner_v1_Mutation_Write_descriptor;
       }
 
-      @Override
-      protected FieldAccessorTable internalGetFieldAccessorTable() {
-        return MutationProto.internal_static_google_spanner_v1_Mutation_Write_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(Write.class, Builder.class);
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.spanner.v1.MutationProto
+            .internal_static_google_spanner_v1_Mutation_Write_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.spanner.v1.Mutation.Write.class,
+                com.google.spanner.v1.Mutation.Write.Builder.class);
       }
 
       // Construct using com.google.spanner.v1.Mutation.Write.newBuilder()
@@ -904,7 +932,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -915,7 +943,7 @@ private void maybeForceBuilderInitialization() {
         }
       }
 
-      @Override
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         table_ = "";
@@ -931,28 +959,30 @@ public Builder clear() {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return MutationProto.internal_static_google_spanner_v1_Mutation_Write_descriptor;
+        return com.google.spanner.v1.MutationProto
+            .internal_static_google_spanner_v1_Mutation_Write_descriptor;
       }
 
-      @Override
-      public Write getDefaultInstanceForType() {
-        return Write.getDefaultInstance();
+      @java.lang.Override
+      public com.google.spanner.v1.Mutation.Write getDefaultInstanceForType() {
+        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       }
 
-      @Override
-      public Write build() {
-        Write result = buildPartial();
+      @java.lang.Override
+      public com.google.spanner.v1.Mutation.Write build() {
+        com.google.spanner.v1.Mutation.Write result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @Override
-      public Write buildPartial() {
-        Write result = new Write(this);
+      @java.lang.Override
+      public com.google.spanner.v1.Mutation.Write buildPartial() {
+        com.google.spanner.v1.Mutation.Write result =
+            new com.google.spanner.v1.Mutation.Write(this);
         int from_bitField0_ = bitField0_;
         result.table_ = table_;
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -973,50 +1003,53 @@ public Write buildPartial() {
         return result;
       }
 
-      @Override
+      @java.lang.Override
       public Builder clone() {
         return super.clone();
       }
 
-      @Override
-      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.setField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @Override
+      @java.lang.Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof Write) {
-          return mergeFrom((Write) other);
+        if (other instanceof com.google.spanner.v1.Mutation.Write) {
+          return mergeFrom((com.google.spanner.v1.Mutation.Write) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(Write other) {
-        if (other == Write.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.google.spanner.v1.Mutation.Write other) {
+        if (other == com.google.spanner.v1.Mutation.Write.getDefaultInstance()) return this;
         if (!other.getTable().isEmpty()) {
           table_ = other.table_;
           onChanged();
@@ -1063,21 +1096,21 @@ public Builder mergeFrom(Write other) {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        Write parsedMessage = null;
+        com.google.spanner.v1.Mutation.Write parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (Write) e.getUnfinishedMessage();
+          parsedMessage = (com.google.spanner.v1.Mutation.Write) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1089,7 +1122,7 @@ public Builder mergeFrom(
 
       private int bitField0_;
 
-      private Object table_ = "";
+      private java.lang.Object table_ = "";
       /**
        *
        *
@@ -1101,15 +1134,15 @@ public Builder mergeFrom(
        *
        * @return The table.
        */
-      public String getTable() {
-        Object ref = table_;
-        if (!(ref instanceof String)) {
+      public java.lang.String getTable() {
+        java.lang.Object ref = table_;
+        if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-          String s = bs.toStringUtf8();
+          java.lang.String s = bs.toStringUtf8();
           table_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -1124,10 +1157,10 @@ public String getTable() {
        * @return The bytes for table.
        */
       public com.google.protobuf.ByteString getTableBytes() {
-        Object ref = table_;
+        java.lang.Object ref = table_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
           table_ = b;
           return b;
         } else {
@@ -1146,7 +1179,7 @@ public com.google.protobuf.ByteString getTableBytes() {
        * @param value The table to set.
        * @return This builder for chaining.
        */
-      public Builder setTable(String value) {
+      public Builder setTable(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1253,7 +1286,7 @@ public int getColumnsCount() {
        * @param index The index of the element to return.
        * @return The columns at the given index.
        */
-      public String getColumns(int index) {
+      public java.lang.String getColumns(int index) {
         return columns_.get(index);
       }
       /**
@@ -1290,7 +1323,7 @@ public com.google.protobuf.ByteString getColumnsBytes(int index) {
        * @param value The columns to set.
        * @return This builder for chaining.
        */
-      public Builder setColumns(int index, String value) {
+      public Builder setColumns(int index, java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1314,7 +1347,7 @@ public Builder setColumns(int index, String value) {
        * @param value The columns to add.
        * @return This builder for chaining.
        */
-      public Builder addColumns(String value) {
+      public Builder addColumns(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1338,7 +1371,7 @@ public Builder addColumns(String value) {
        * @param values The columns to add.
        * @return This builder for chaining.
        */
-      public Builder addAllColumns(Iterable values) {
+      public Builder addAllColumns(java.lang.Iterable values) {
         ensureColumnsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, columns_);
         onChanged();
@@ -1656,7 +1689,8 @@ public Builder addValues(int index, com.google.protobuf.ListValue.Builder builde
        *
        * repeated .google.protobuf.ListValue values = 3;
        */
-      public Builder addAllValues(Iterable values) {
+      public Builder addAllValues(
+          java.lang.Iterable values) {
         if (valuesBuilder_ == null) {
           ensureValuesIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(values, values_);
@@ -1861,13 +1895,13 @@ public java.util.List getValuesBuilderLis
         return valuesBuilder_;
       }
 
-      @Override
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @Override
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1877,19 +1911,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.Mutation.Write)
-    private static final Write DEFAULT_INSTANCE;
+    private static final com.google.spanner.v1.Mutation.Write DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new Write();
+      DEFAULT_INSTANCE = new com.google.spanner.v1.Mutation.Write();
     }
 
-    public static Write getDefaultInstance() {
+    public static com.google.spanner.v1.Mutation.Write getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @Override
+          @java.lang.Override
           public Write parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1902,13 +1936,13 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @Override
-    public Write getDefaultInstanceForType() {
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation.Write getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
@@ -1929,7 +1963,7 @@ public interface DeleteOrBuilder
      *
      * @return The table.
      */
-    String getTable();
+    java.lang.String getTable();
     /**
      *
      *
@@ -1976,7 +2010,7 @@ public interface DeleteOrBuilder
      *
      * @return The keySet.
      */
-    KeySet getKeySet();
+    com.google.spanner.v1.KeySet getKeySet();
     /**
      *
      *
@@ -1991,7 +2025,7 @@ public interface DeleteOrBuilder
      *
      * .google.spanner.v1.KeySet key_set = 2;
      */
-    KeySetOrBuilder getKeySetOrBuilder();
+    com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder();
   }
   /**
    *
@@ -2016,13 +2050,13 @@ private Delete() {
       table_ = "";
     }
 
-    @Override
+    @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Delete();
     }
 
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -2033,7 +2067,7 @@ private Delete(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2047,18 +2081,19 @@ private Delete(
               break;
             case 10:
               {
-                String s = input.readStringRequireUtf8();
+                java.lang.String s = input.readStringRequireUtf8();
 
                 table_ = s;
                 break;
               }
             case 18:
               {
-                KeySet.Builder subBuilder = null;
+                com.google.spanner.v1.KeySet.Builder subBuilder = null;
                 if (keySet_ != null) {
                   subBuilder = keySet_.toBuilder();
                 }
-                keySet_ = input.readMessage(KeySet.parser(), extensionRegistry);
+                keySet_ =
+                    input.readMessage(com.google.spanner.v1.KeySet.parser(), extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(keySet_);
                   keySet_ = subBuilder.buildPartial();
@@ -2086,17 +2121,22 @@ private Delete(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return MutationProto.internal_static_google_spanner_v1_Mutation_Delete_descriptor;
+      return com.google.spanner.v1.MutationProto
+          .internal_static_google_spanner_v1_Mutation_Delete_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return MutationProto.internal_static_google_spanner_v1_Mutation_Delete_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(Delete.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.MutationProto
+          .internal_static_google_spanner_v1_Mutation_Delete_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.Mutation.Delete.class,
+              com.google.spanner.v1.Mutation.Delete.Builder.class);
     }
 
     public static final int TABLE_FIELD_NUMBER = 1;
-    private volatile Object table_;
+    private volatile java.lang.Object table_;
     /**
      *
      *
@@ -2108,14 +2148,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
      *
      * @return The table.
      */
-    @Override
-    public String getTable() {
-      Object ref = table_;
-      if (ref instanceof String) {
-        return (String) ref;
+    @java.lang.Override
+    public java.lang.String getTable() {
+      java.lang.Object ref = table_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         table_ = s;
         return s;
       }
@@ -2131,12 +2171,12 @@ public String getTable() {
      *
      * @return The bytes for table.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ByteString getTableBytes() {
-      Object ref = table_;
-      if (ref instanceof String) {
+      java.lang.Object ref = table_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         table_ = b;
         return b;
       } else {
@@ -2145,7 +2185,7 @@ public com.google.protobuf.ByteString getTableBytes() {
     }
 
     public static final int KEY_SET_FIELD_NUMBER = 2;
-    private KeySet keySet_;
+    private com.google.spanner.v1.KeySet keySet_;
     /**
      *
      *
@@ -2162,7 +2202,7 @@ public com.google.protobuf.ByteString getTableBytes() {
      *
      * @return Whether the keySet field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasKeySet() {
       return keySet_ != null;
     }
@@ -2182,9 +2222,9 @@ public boolean hasKeySet() {
      *
      * @return The keySet.
      */
-    @Override
-    public KeySet getKeySet() {
-      return keySet_ == null ? KeySet.getDefaultInstance() : keySet_;
+    @java.lang.Override
+    public com.google.spanner.v1.KeySet getKeySet() {
+      return keySet_ == null ? com.google.spanner.v1.KeySet.getDefaultInstance() : keySet_;
     }
     /**
      *
@@ -2200,14 +2240,14 @@ public KeySet getKeySet() {
      *
      * .google.spanner.v1.KeySet key_set = 2;
      */
-    @Override
-    public KeySetOrBuilder getKeySetOrBuilder() {
+    @java.lang.Override
+    public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
       return getKeySet();
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2217,7 +2257,7 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (!getTableBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, table_);
@@ -2228,7 +2268,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       unknownFields.writeTo(output);
     }
 
-    @Override
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2245,15 +2285,15 @@ public int getSerializedSize() {
       return size;
     }
 
-    @Override
-    public boolean equals(final Object obj) {
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof Delete)) {
+      if (!(obj instanceof com.google.spanner.v1.Mutation.Delete)) {
         return super.equals(obj);
       }
-      Delete other = (Delete) obj;
+      com.google.spanner.v1.Mutation.Delete other = (com.google.spanner.v1.Mutation.Delete) obj;
 
       if (!getTable().equals(other.getTable())) return false;
       if (hasKeySet() != other.hasKeySet()) return false;
@@ -2264,7 +2304,7 @@ public boolean equals(final Object obj) {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -2282,68 +2322,71 @@ public int hashCode() {
       return hash;
     }
 
-    public static Delete parseFrom(java.nio.ByteBuffer data)
+    public static com.google.spanner.v1.Mutation.Delete parseFrom(java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static Delete parseFrom(
+    public static com.google.spanner.v1.Mutation.Delete parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static Delete parseFrom(com.google.protobuf.ByteString data)
+    public static com.google.spanner.v1.Mutation.Delete parseFrom(
+        com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static Delete parseFrom(
+    public static com.google.spanner.v1.Mutation.Delete parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static Delete parseFrom(byte[] data)
+    public static com.google.spanner.v1.Mutation.Delete parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static Delete parseFrom(
+    public static com.google.spanner.v1.Mutation.Delete parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static Delete parseFrom(java.io.InputStream input) throws java.io.IOException {
+    public static com.google.spanner.v1.Mutation.Delete parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static Delete parseFrom(
+    public static com.google.spanner.v1.Mutation.Delete 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 Delete parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+    public static com.google.spanner.v1.Mutation.Delete parseDelimitedFrom(
+        java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static Delete parseDelimitedFrom(
+    public static com.google.spanner.v1.Mutation.Delete 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 Delete parseFrom(com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.Mutation.Delete parseFrom(
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static Delete parseFrom(
+    public static com.google.spanner.v1.Mutation.Delete parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2351,7 +2394,7 @@ public static Delete parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @Override
+    @java.lang.Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -2360,17 +2403,18 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(Delete prototype) {
+    public static Builder newBuilder(com.google.spanner.v1.Mutation.Delete prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @Override
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
     }
 
-    @Override
-    protected Builder newBuilderForType(BuilderParent parent) {
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -2387,15 +2431,20 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.Mutation.Delete)
-        DeleteOrBuilder {
+        com.google.spanner.v1.Mutation.DeleteOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return MutationProto.internal_static_google_spanner_v1_Mutation_Delete_descriptor;
+        return com.google.spanner.v1.MutationProto
+            .internal_static_google_spanner_v1_Mutation_Delete_descriptor;
       }
 
-      @Override
-      protected FieldAccessorTable internalGetFieldAccessorTable() {
-        return MutationProto.internal_static_google_spanner_v1_Mutation_Delete_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(Delete.class, Builder.class);
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.spanner.v1.MutationProto
+            .internal_static_google_spanner_v1_Mutation_Delete_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.spanner.v1.Mutation.Delete.class,
+                com.google.spanner.v1.Mutation.Delete.Builder.class);
       }
 
       // Construct using com.google.spanner.v1.Mutation.Delete.newBuilder()
@@ -2403,7 +2452,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -2412,7 +2461,7 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @Override
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         table_ = "";
@@ -2426,28 +2475,30 @@ public Builder clear() {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return MutationProto.internal_static_google_spanner_v1_Mutation_Delete_descriptor;
+        return com.google.spanner.v1.MutationProto
+            .internal_static_google_spanner_v1_Mutation_Delete_descriptor;
       }
 
-      @Override
-      public Delete getDefaultInstanceForType() {
-        return Delete.getDefaultInstance();
+      @java.lang.Override
+      public com.google.spanner.v1.Mutation.Delete getDefaultInstanceForType() {
+        return com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
       }
 
-      @Override
-      public Delete build() {
-        Delete result = buildPartial();
+      @java.lang.Override
+      public com.google.spanner.v1.Mutation.Delete build() {
+        com.google.spanner.v1.Mutation.Delete result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @Override
-      public Delete buildPartial() {
-        Delete result = new Delete(this);
+      @java.lang.Override
+      public com.google.spanner.v1.Mutation.Delete buildPartial() {
+        com.google.spanner.v1.Mutation.Delete result =
+            new com.google.spanner.v1.Mutation.Delete(this);
         result.table_ = table_;
         if (keySetBuilder_ == null) {
           result.keySet_ = keySet_;
@@ -2458,50 +2509,53 @@ public Delete buildPartial() {
         return result;
       }
 
-      @Override
+      @java.lang.Override
       public Builder clone() {
         return super.clone();
       }
 
-      @Override
-      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.setField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @Override
+      @java.lang.Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof Delete) {
-          return mergeFrom((Delete) other);
+        if (other instanceof com.google.spanner.v1.Mutation.Delete) {
+          return mergeFrom((com.google.spanner.v1.Mutation.Delete) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(Delete other) {
-        if (other == Delete.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.google.spanner.v1.Mutation.Delete other) {
+        if (other == com.google.spanner.v1.Mutation.Delete.getDefaultInstance()) return this;
         if (!other.getTable().isEmpty()) {
           table_ = other.table_;
           onChanged();
@@ -2514,21 +2568,21 @@ public Builder mergeFrom(Delete other) {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        Delete parsedMessage = null;
+        com.google.spanner.v1.Mutation.Delete parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (Delete) e.getUnfinishedMessage();
+          parsedMessage = (com.google.spanner.v1.Mutation.Delete) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2538,7 +2592,7 @@ public Builder mergeFrom(
         return this;
       }
 
-      private Object table_ = "";
+      private java.lang.Object table_ = "";
       /**
        *
        *
@@ -2550,15 +2604,15 @@ public Builder mergeFrom(
        *
        * @return The table.
        */
-      public String getTable() {
-        Object ref = table_;
-        if (!(ref instanceof String)) {
+      public java.lang.String getTable() {
+        java.lang.Object ref = table_;
+        if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-          String s = bs.toStringUtf8();
+          java.lang.String s = bs.toStringUtf8();
           table_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -2573,10 +2627,10 @@ public String getTable() {
        * @return The bytes for table.
        */
       public com.google.protobuf.ByteString getTableBytes() {
-        Object ref = table_;
+        java.lang.Object ref = table_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
           table_ = b;
           return b;
         } else {
@@ -2595,7 +2649,7 @@ public com.google.protobuf.ByteString getTableBytes() {
        * @param value The table to set.
        * @return This builder for chaining.
        */
-      public Builder setTable(String value) {
+      public Builder setTable(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2644,8 +2698,11 @@ public Builder setTableBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private KeySet keySet_;
-      private com.google.protobuf.SingleFieldBuilderV3
+      private com.google.spanner.v1.KeySet keySet_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.spanner.v1.KeySet,
+              com.google.spanner.v1.KeySet.Builder,
+              com.google.spanner.v1.KeySetOrBuilder>
           keySetBuilder_;
       /**
        *
@@ -2682,9 +2739,9 @@ public boolean hasKeySet() {
        *
        * @return The keySet.
        */
-      public KeySet getKeySet() {
+      public com.google.spanner.v1.KeySet getKeySet() {
         if (keySetBuilder_ == null) {
-          return keySet_ == null ? KeySet.getDefaultInstance() : keySet_;
+          return keySet_ == null ? com.google.spanner.v1.KeySet.getDefaultInstance() : keySet_;
         } else {
           return keySetBuilder_.getMessage();
         }
@@ -2703,7 +2760,7 @@ public KeySet getKeySet() {
        *
        * .google.spanner.v1.KeySet key_set = 2;
        */
-      public Builder setKeySet(KeySet value) {
+      public Builder setKeySet(com.google.spanner.v1.KeySet value) {
         if (keySetBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2730,7 +2787,7 @@ public Builder setKeySet(KeySet value) {
        *
        * .google.spanner.v1.KeySet key_set = 2;
        */
-      public Builder setKeySet(KeySet.Builder builderForValue) {
+      public Builder setKeySet(com.google.spanner.v1.KeySet.Builder builderForValue) {
         if (keySetBuilder_ == null) {
           keySet_ = builderForValue.build();
           onChanged();
@@ -2754,10 +2811,11 @@ public Builder setKeySet(KeySet.Builder builderForValue) {
        *
        * .google.spanner.v1.KeySet key_set = 2;
        */
-      public Builder mergeKeySet(KeySet value) {
+      public Builder mergeKeySet(com.google.spanner.v1.KeySet value) {
         if (keySetBuilder_ == null) {
           if (keySet_ != null) {
-            keySet_ = KeySet.newBuilder(keySet_).mergeFrom(value).buildPartial();
+            keySet_ =
+                com.google.spanner.v1.KeySet.newBuilder(keySet_).mergeFrom(value).buildPartial();
           } else {
             keySet_ = value;
           }
@@ -2807,7 +2865,7 @@ public Builder clearKeySet() {
        *
        * .google.spanner.v1.KeySet key_set = 2;
        */
-      public KeySet.Builder getKeySetBuilder() {
+      public com.google.spanner.v1.KeySet.Builder getKeySetBuilder() {
 
         onChanged();
         return getKeySetFieldBuilder().getBuilder();
@@ -2826,11 +2884,11 @@ public KeySet.Builder getKeySetBuilder() {
        *
        * .google.spanner.v1.KeySet key_set = 2;
        */
-      public KeySetOrBuilder getKeySetOrBuilder() {
+      public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
         if (keySetBuilder_ != null) {
           return keySetBuilder_.getMessageOrBuilder();
         } else {
-          return keySet_ == null ? KeySet.getDefaultInstance() : keySet_;
+          return keySet_ == null ? com.google.spanner.v1.KeySet.getDefaultInstance() : keySet_;
         }
       }
       /**
@@ -2847,24 +2905,30 @@ public KeySetOrBuilder getKeySetOrBuilder() {
        *
        * .google.spanner.v1.KeySet key_set = 2;
        */
-      private com.google.protobuf.SingleFieldBuilderV3
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.spanner.v1.KeySet,
+              com.google.spanner.v1.KeySet.Builder,
+              com.google.spanner.v1.KeySetOrBuilder>
           getKeySetFieldBuilder() {
         if (keySetBuilder_ == null) {
           keySetBuilder_ =
-              new com.google.protobuf.SingleFieldBuilderV3(
+              new com.google.protobuf.SingleFieldBuilderV3<
+                  com.google.spanner.v1.KeySet,
+                  com.google.spanner.v1.KeySet.Builder,
+                  com.google.spanner.v1.KeySetOrBuilder>(
                   getKeySet(), getParentForChildren(), isClean());
           keySet_ = null;
         }
         return keySetBuilder_;
       }
 
-      @Override
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @Override
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2874,19 +2938,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.Mutation.Delete)
-    private static final Delete DEFAULT_INSTANCE;
+    private static final com.google.spanner.v1.Mutation.Delete DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new Delete();
+      DEFAULT_INSTANCE = new com.google.spanner.v1.Mutation.Delete();
     }
 
-    public static Delete getDefaultInstance() {
+    public static com.google.spanner.v1.Mutation.Delete getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @Override
+          @java.lang.Override
           public Delete parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2899,21 +2963,24 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @Override
-    public Delete getDefaultInstanceForType() {
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation.Delete getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
 
   private int operationCase_ = 0;
-  private Object operation_;
+  private java.lang.Object operation_;
 
-  public enum OperationCase implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
+  public enum OperationCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     INSERT(1),
     UPDATE(2),
     INSERT_OR_UPDATE(3),
@@ -2930,7 +2997,7 @@ private OperationCase(int value) {
      * @return The enum associated with the given number.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @Deprecated
+    @java.lang.Deprecated
     public static OperationCase valueOf(int value) {
       return forNumber(value);
     }
@@ -2976,7 +3043,7 @@ public OperationCase getOperationCase() {
    *
    * @return Whether the insert field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasInsert() {
     return operationCase_ == 1;
   }
@@ -2992,12 +3059,12 @@ public boolean hasInsert() {
    *
    * @return The insert.
    */
-  @Override
-  public Write getInsert() {
+  @java.lang.Override
+  public com.google.spanner.v1.Mutation.Write getInsert() {
     if (operationCase_ == 1) {
-      return (Write) operation_;
+      return (com.google.spanner.v1.Mutation.Write) operation_;
     }
-    return Write.getDefaultInstance();
+    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
   }
   /**
    *
@@ -3009,12 +3076,12 @@ public Write getInsert() {
    *
    * .google.spanner.v1.Mutation.Write insert = 1;
    */
-  @Override
-  public WriteOrBuilder getInsertOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrBuilder() {
     if (operationCase_ == 1) {
-      return (Write) operation_;
+      return (com.google.spanner.v1.Mutation.Write) operation_;
     }
-    return Write.getDefaultInstance();
+    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
   }
 
   public static final int UPDATE_FIELD_NUMBER = 2;
@@ -3030,7 +3097,7 @@ public WriteOrBuilder getInsertOrBuilder() {
    *
    * @return Whether the update field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasUpdate() {
     return operationCase_ == 2;
   }
@@ -3046,12 +3113,12 @@ public boolean hasUpdate() {
    *
    * @return The update.
    */
-  @Override
-  public Write getUpdate() {
+  @java.lang.Override
+  public com.google.spanner.v1.Mutation.Write getUpdate() {
     if (operationCase_ == 2) {
-      return (Write) operation_;
+      return (com.google.spanner.v1.Mutation.Write) operation_;
     }
-    return Write.getDefaultInstance();
+    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
   }
   /**
    *
@@ -3063,12 +3130,12 @@ public Write getUpdate() {
    *
    * .google.spanner.v1.Mutation.Write update = 2;
    */
-  @Override
-  public WriteOrBuilder getUpdateOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.Mutation.WriteOrBuilder getUpdateOrBuilder() {
     if (operationCase_ == 2) {
-      return (Write) operation_;
+      return (com.google.spanner.v1.Mutation.Write) operation_;
     }
-    return Write.getDefaultInstance();
+    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
   }
 
   public static final int INSERT_OR_UPDATE_FIELD_NUMBER = 3;
@@ -3088,7 +3155,7 @@ public WriteOrBuilder getUpdateOrBuilder() {
    *
    * @return Whether the insertOrUpdate field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasInsertOrUpdate() {
     return operationCase_ == 3;
   }
@@ -3108,12 +3175,12 @@ public boolean hasInsertOrUpdate() {
    *
    * @return The insertOrUpdate.
    */
-  @Override
-  public Write getInsertOrUpdate() {
+  @java.lang.Override
+  public com.google.spanner.v1.Mutation.Write getInsertOrUpdate() {
     if (operationCase_ == 3) {
-      return (Write) operation_;
+      return (com.google.spanner.v1.Mutation.Write) operation_;
     }
-    return Write.getDefaultInstance();
+    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
   }
   /**
    *
@@ -3129,12 +3196,12 @@ public Write getInsertOrUpdate() {
    *
    * .google.spanner.v1.Mutation.Write insert_or_update = 3;
    */
-  @Override
-  public WriteOrBuilder getInsertOrUpdateOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrUpdateOrBuilder() {
     if (operationCase_ == 3) {
-      return (Write) operation_;
+      return (com.google.spanner.v1.Mutation.Write) operation_;
     }
-    return Write.getDefaultInstance();
+    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
   }
 
   public static final int REPLACE_FIELD_NUMBER = 4;
@@ -3156,7 +3223,7 @@ public WriteOrBuilder getInsertOrUpdateOrBuilder() {
    *
    * @return Whether the replace field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasReplace() {
     return operationCase_ == 4;
   }
@@ -3178,12 +3245,12 @@ public boolean hasReplace() {
    *
    * @return The replace.
    */
-  @Override
-  public Write getReplace() {
+  @java.lang.Override
+  public com.google.spanner.v1.Mutation.Write getReplace() {
     if (operationCase_ == 4) {
-      return (Write) operation_;
+      return (com.google.spanner.v1.Mutation.Write) operation_;
     }
-    return Write.getDefaultInstance();
+    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
   }
   /**
    *
@@ -3201,12 +3268,12 @@ public Write getReplace() {
    *
    * .google.spanner.v1.Mutation.Write replace = 4;
    */
-  @Override
-  public WriteOrBuilder getReplaceOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.Mutation.WriteOrBuilder getReplaceOrBuilder() {
     if (operationCase_ == 4) {
-      return (Write) operation_;
+      return (com.google.spanner.v1.Mutation.Write) operation_;
     }
-    return Write.getDefaultInstance();
+    return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
   }
 
   public static final int DELETE_FIELD_NUMBER = 5;
@@ -3222,7 +3289,7 @@ public WriteOrBuilder getReplaceOrBuilder() {
    *
    * @return Whether the delete field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasDelete() {
     return operationCase_ == 5;
   }
@@ -3238,12 +3305,12 @@ public boolean hasDelete() {
    *
    * @return The delete.
    */
-  @Override
-  public Delete getDelete() {
+  @java.lang.Override
+  public com.google.spanner.v1.Mutation.Delete getDelete() {
     if (operationCase_ == 5) {
-      return (Delete) operation_;
+      return (com.google.spanner.v1.Mutation.Delete) operation_;
     }
-    return Delete.getDefaultInstance();
+    return com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
   }
   /**
    *
@@ -3255,17 +3322,17 @@ public Delete getDelete() {
    *
    * .google.spanner.v1.Mutation.Delete delete = 5;
    */
-  @Override
-  public DeleteOrBuilder getDeleteOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.Mutation.DeleteOrBuilder getDeleteOrBuilder() {
     if (operationCase_ == 5) {
-      return (Delete) operation_;
+      return (com.google.spanner.v1.Mutation.Delete) operation_;
     }
-    return Delete.getDefaultInstance();
+    return com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -3275,61 +3342,71 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (operationCase_ == 1) {
-      output.writeMessage(1, (Write) operation_);
+      output.writeMessage(1, (com.google.spanner.v1.Mutation.Write) operation_);
     }
     if (operationCase_ == 2) {
-      output.writeMessage(2, (Write) operation_);
+      output.writeMessage(2, (com.google.spanner.v1.Mutation.Write) operation_);
     }
     if (operationCase_ == 3) {
-      output.writeMessage(3, (Write) operation_);
+      output.writeMessage(3, (com.google.spanner.v1.Mutation.Write) operation_);
     }
     if (operationCase_ == 4) {
-      output.writeMessage(4, (Write) operation_);
+      output.writeMessage(4, (com.google.spanner.v1.Mutation.Write) operation_);
     }
     if (operationCase_ == 5) {
-      output.writeMessage(5, (Delete) operation_);
+      output.writeMessage(5, (com.google.spanner.v1.Mutation.Delete) operation_);
     }
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
     if (operationCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, (Write) operation_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              1, (com.google.spanner.v1.Mutation.Write) operation_);
     }
     if (operationCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, (Write) operation_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              2, (com.google.spanner.v1.Mutation.Write) operation_);
     }
     if (operationCase_ == 3) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, (Write) operation_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              3, (com.google.spanner.v1.Mutation.Write) operation_);
     }
     if (operationCase_ == 4) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, (Write) operation_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              4, (com.google.spanner.v1.Mutation.Write) operation_);
     }
     if (operationCase_ == 5) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, (Delete) operation_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              5, (com.google.spanner.v1.Mutation.Delete) operation_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof Mutation)) {
+    if (!(obj instanceof com.google.spanner.v1.Mutation)) {
       return super.equals(obj);
     }
-    Mutation other = (Mutation) obj;
+    com.google.spanner.v1.Mutation other = (com.google.spanner.v1.Mutation) obj;
 
     if (!getOperationCase().equals(other.getOperationCase())) return false;
     switch (operationCase_) {
@@ -3355,7 +3432,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -3391,68 +3468,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static Mutation parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.Mutation parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Mutation parseFrom(
+  public static com.google.spanner.v1.Mutation parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Mutation parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.Mutation parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Mutation parseFrom(
+  public static com.google.spanner.v1.Mutation parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Mutation parseFrom(byte[] data)
+  public static com.google.spanner.v1.Mutation parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Mutation parseFrom(
+  public static com.google.spanner.v1.Mutation parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Mutation parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.Mutation parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static Mutation parseFrom(
+  public static com.google.spanner.v1.Mutation 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 Mutation parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.Mutation parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static Mutation parseDelimitedFrom(
+  public static com.google.spanner.v1.Mutation 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 Mutation parseFrom(com.google.protobuf.CodedInputStream input)
+  public static com.google.spanner.v1.Mutation parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static Mutation parseFrom(
+  public static com.google.spanner.v1.Mutation parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -3460,7 +3539,7 @@ public static Mutation parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -3469,17 +3548,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(Mutation prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.Mutation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -3497,15 +3576,19 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.Mutation)
-      MutationOrBuilder {
+      com.google.spanner.v1.MutationOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return MutationProto.internal_static_google_spanner_v1_Mutation_descriptor;
+      return com.google.spanner.v1.MutationProto
+          .internal_static_google_spanner_v1_Mutation_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return MutationProto.internal_static_google_spanner_v1_Mutation_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(Mutation.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.MutationProto
+          .internal_static_google_spanner_v1_Mutation_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.Mutation.class, com.google.spanner.v1.Mutation.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.Mutation.newBuilder()
@@ -3513,7 +3596,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -3522,7 +3605,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       operationCase_ = 0;
@@ -3530,28 +3613,29 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return MutationProto.internal_static_google_spanner_v1_Mutation_descriptor;
+      return com.google.spanner.v1.MutationProto
+          .internal_static_google_spanner_v1_Mutation_descriptor;
     }
 
-    @Override
-    public Mutation getDefaultInstanceForType() {
-      return Mutation.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation getDefaultInstanceForType() {
+      return com.google.spanner.v1.Mutation.getDefaultInstance();
     }
 
-    @Override
-    public Mutation build() {
-      Mutation result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation build() {
+      com.google.spanner.v1.Mutation result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public Mutation buildPartial() {
-      Mutation result = new Mutation(this);
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation buildPartial() {
+      com.google.spanner.v1.Mutation result = new com.google.spanner.v1.Mutation(this);
       if (operationCase_ == 1) {
         if (insertBuilder_ == null) {
           result.operation_ = operation_;
@@ -3592,50 +3676,51 @@ public Mutation buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof Mutation) {
-        return mergeFrom((Mutation) other);
+      if (other instanceof com.google.spanner.v1.Mutation) {
+        return mergeFrom((com.google.spanner.v1.Mutation) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(Mutation other) {
-      if (other == Mutation.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.Mutation other) {
+      if (other == com.google.spanner.v1.Mutation.getDefaultInstance()) return this;
       switch (other.getOperationCase()) {
         case INSERT:
           {
@@ -3672,21 +3757,21 @@ public Builder mergeFrom(Mutation other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Mutation parsedMessage = null;
+      com.google.spanner.v1.Mutation parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (Mutation) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.Mutation) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -3697,7 +3782,7 @@ public Builder mergeFrom(
     }
 
     private int operationCase_ = 0;
-    private Object operation_;
+    private java.lang.Object operation_;
 
     public OperationCase getOperationCase() {
       return OperationCase.forNumber(operationCase_);
@@ -3710,7 +3795,10 @@ public Builder clearOperation() {
       return this;
     }
 
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Mutation.Write,
+            com.google.spanner.v1.Mutation.Write.Builder,
+            com.google.spanner.v1.Mutation.WriteOrBuilder>
         insertBuilder_;
     /**
      *
@@ -3724,7 +3812,7 @@ public Builder clearOperation() {
      *
      * @return Whether the insert field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasInsert() {
       return operationCase_ == 1;
     }
@@ -3740,18 +3828,18 @@ public boolean hasInsert() {
      *
      * @return The insert.
      */
-    @Override
-    public Write getInsert() {
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation.Write getInsert() {
       if (insertBuilder_ == null) {
         if (operationCase_ == 1) {
-          return (Write) operation_;
+          return (com.google.spanner.v1.Mutation.Write) operation_;
         }
-        return Write.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       } else {
         if (operationCase_ == 1) {
           return insertBuilder_.getMessage();
         }
-        return Write.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       }
     }
     /**
@@ -3764,7 +3852,7 @@ public Write getInsert() {
      *
      * .google.spanner.v1.Mutation.Write insert = 1;
      */
-    public Builder setInsert(Write value) {
+    public Builder setInsert(com.google.spanner.v1.Mutation.Write value) {
       if (insertBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -3787,7 +3875,7 @@ public Builder setInsert(Write value) {
      *
      * .google.spanner.v1.Mutation.Write insert = 1;
      */
-    public Builder setInsert(Write.Builder builderForValue) {
+    public Builder setInsert(com.google.spanner.v1.Mutation.Write.Builder builderForValue) {
       if (insertBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -3807,10 +3895,15 @@ public Builder setInsert(Write.Builder builderForValue) {
      *
      * .google.spanner.v1.Mutation.Write insert = 1;
      */
-    public Builder mergeInsert(Write value) {
+    public Builder mergeInsert(com.google.spanner.v1.Mutation.Write value) {
       if (insertBuilder_ == null) {
-        if (operationCase_ == 1 && operation_ != Write.getDefaultInstance()) {
-          operation_ = Write.newBuilder((Write) operation_).mergeFrom(value).buildPartial();
+        if (operationCase_ == 1
+            && operation_ != com.google.spanner.v1.Mutation.Write.getDefaultInstance()) {
+          operation_ =
+              com.google.spanner.v1.Mutation.Write.newBuilder(
+                      (com.google.spanner.v1.Mutation.Write) operation_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           operation_ = value;
         }
@@ -3860,7 +3953,7 @@ public Builder clearInsert() {
      *
      * .google.spanner.v1.Mutation.Write insert = 1;
      */
-    public Write.Builder getInsertBuilder() {
+    public com.google.spanner.v1.Mutation.Write.Builder getInsertBuilder() {
       return getInsertFieldBuilder().getBuilder();
     }
     /**
@@ -3873,15 +3966,15 @@ public Write.Builder getInsertBuilder() {
      *
      * .google.spanner.v1.Mutation.Write insert = 1;
      */
-    @Override
-    public WriteOrBuilder getInsertOrBuilder() {
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrBuilder() {
       if ((operationCase_ == 1) && (insertBuilder_ != null)) {
         return insertBuilder_.getMessageOrBuilder();
       } else {
         if (operationCase_ == 1) {
-          return (Write) operation_;
+          return (com.google.spanner.v1.Mutation.Write) operation_;
         }
-        return Write.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       }
     }
     /**
@@ -3894,15 +3987,23 @@ public WriteOrBuilder getInsertOrBuilder() {
      *
      * .google.spanner.v1.Mutation.Write insert = 1;
      */
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Mutation.Write,
+            com.google.spanner.v1.Mutation.Write.Builder,
+            com.google.spanner.v1.Mutation.WriteOrBuilder>
         getInsertFieldBuilder() {
       if (insertBuilder_ == null) {
         if (!(operationCase_ == 1)) {
-          operation_ = Write.getDefaultInstance();
+          operation_ = com.google.spanner.v1.Mutation.Write.getDefaultInstance();
         }
         insertBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3(
-                (Write) operation_, getParentForChildren(), isClean());
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.spanner.v1.Mutation.Write,
+                com.google.spanner.v1.Mutation.Write.Builder,
+                com.google.spanner.v1.Mutation.WriteOrBuilder>(
+                (com.google.spanner.v1.Mutation.Write) operation_,
+                getParentForChildren(),
+                isClean());
         operation_ = null;
       }
       operationCase_ = 1;
@@ -3911,7 +4012,10 @@ public WriteOrBuilder getInsertOrBuilder() {
       return insertBuilder_;
     }
 
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Mutation.Write,
+            com.google.spanner.v1.Mutation.Write.Builder,
+            com.google.spanner.v1.Mutation.WriteOrBuilder>
         updateBuilder_;
     /**
      *
@@ -3925,7 +4029,7 @@ public WriteOrBuilder getInsertOrBuilder() {
      *
      * @return Whether the update field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasUpdate() {
       return operationCase_ == 2;
     }
@@ -3941,18 +4045,18 @@ public boolean hasUpdate() {
      *
      * @return The update.
      */
-    @Override
-    public Write getUpdate() {
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation.Write getUpdate() {
       if (updateBuilder_ == null) {
         if (operationCase_ == 2) {
-          return (Write) operation_;
+          return (com.google.spanner.v1.Mutation.Write) operation_;
         }
-        return Write.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       } else {
         if (operationCase_ == 2) {
           return updateBuilder_.getMessage();
         }
-        return Write.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       }
     }
     /**
@@ -3965,7 +4069,7 @@ public Write getUpdate() {
      *
      * .google.spanner.v1.Mutation.Write update = 2;
      */
-    public Builder setUpdate(Write value) {
+    public Builder setUpdate(com.google.spanner.v1.Mutation.Write value) {
       if (updateBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -3988,7 +4092,7 @@ public Builder setUpdate(Write value) {
      *
      * .google.spanner.v1.Mutation.Write update = 2;
      */
-    public Builder setUpdate(Write.Builder builderForValue) {
+    public Builder setUpdate(com.google.spanner.v1.Mutation.Write.Builder builderForValue) {
       if (updateBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -4008,10 +4112,15 @@ public Builder setUpdate(Write.Builder builderForValue) {
      *
      * .google.spanner.v1.Mutation.Write update = 2;
      */
-    public Builder mergeUpdate(Write value) {
+    public Builder mergeUpdate(com.google.spanner.v1.Mutation.Write value) {
       if (updateBuilder_ == null) {
-        if (operationCase_ == 2 && operation_ != Write.getDefaultInstance()) {
-          operation_ = Write.newBuilder((Write) operation_).mergeFrom(value).buildPartial();
+        if (operationCase_ == 2
+            && operation_ != com.google.spanner.v1.Mutation.Write.getDefaultInstance()) {
+          operation_ =
+              com.google.spanner.v1.Mutation.Write.newBuilder(
+                      (com.google.spanner.v1.Mutation.Write) operation_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           operation_ = value;
         }
@@ -4061,7 +4170,7 @@ public Builder clearUpdate() {
      *
      * .google.spanner.v1.Mutation.Write update = 2;
      */
-    public Write.Builder getUpdateBuilder() {
+    public com.google.spanner.v1.Mutation.Write.Builder getUpdateBuilder() {
       return getUpdateFieldBuilder().getBuilder();
     }
     /**
@@ -4074,15 +4183,15 @@ public Write.Builder getUpdateBuilder() {
      *
      * .google.spanner.v1.Mutation.Write update = 2;
      */
-    @Override
-    public WriteOrBuilder getUpdateOrBuilder() {
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation.WriteOrBuilder getUpdateOrBuilder() {
       if ((operationCase_ == 2) && (updateBuilder_ != null)) {
         return updateBuilder_.getMessageOrBuilder();
       } else {
         if (operationCase_ == 2) {
-          return (Write) operation_;
+          return (com.google.spanner.v1.Mutation.Write) operation_;
         }
-        return Write.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       }
     }
     /**
@@ -4095,15 +4204,23 @@ public WriteOrBuilder getUpdateOrBuilder() {
      *
      * .google.spanner.v1.Mutation.Write update = 2;
      */
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Mutation.Write,
+            com.google.spanner.v1.Mutation.Write.Builder,
+            com.google.spanner.v1.Mutation.WriteOrBuilder>
         getUpdateFieldBuilder() {
       if (updateBuilder_ == null) {
         if (!(operationCase_ == 2)) {
-          operation_ = Write.getDefaultInstance();
+          operation_ = com.google.spanner.v1.Mutation.Write.getDefaultInstance();
         }
         updateBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3(
-                (Write) operation_, getParentForChildren(), isClean());
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.spanner.v1.Mutation.Write,
+                com.google.spanner.v1.Mutation.Write.Builder,
+                com.google.spanner.v1.Mutation.WriteOrBuilder>(
+                (com.google.spanner.v1.Mutation.Write) operation_,
+                getParentForChildren(),
+                isClean());
         operation_ = null;
       }
       operationCase_ = 2;
@@ -4112,7 +4229,10 @@ public WriteOrBuilder getUpdateOrBuilder() {
       return updateBuilder_;
     }
 
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Mutation.Write,
+            com.google.spanner.v1.Mutation.Write.Builder,
+            com.google.spanner.v1.Mutation.WriteOrBuilder>
         insertOrUpdateBuilder_;
     /**
      *
@@ -4130,7 +4250,7 @@ public WriteOrBuilder getUpdateOrBuilder() {
      *
      * @return Whether the insertOrUpdate field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasInsertOrUpdate() {
       return operationCase_ == 3;
     }
@@ -4150,18 +4270,18 @@ public boolean hasInsertOrUpdate() {
      *
      * @return The insertOrUpdate.
      */
-    @Override
-    public Write getInsertOrUpdate() {
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation.Write getInsertOrUpdate() {
       if (insertOrUpdateBuilder_ == null) {
         if (operationCase_ == 3) {
-          return (Write) operation_;
+          return (com.google.spanner.v1.Mutation.Write) operation_;
         }
-        return Write.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       } else {
         if (operationCase_ == 3) {
           return insertOrUpdateBuilder_.getMessage();
         }
-        return Write.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       }
     }
     /**
@@ -4178,7 +4298,7 @@ public Write getInsertOrUpdate() {
      *
      * .google.spanner.v1.Mutation.Write insert_or_update = 3;
      */
-    public Builder setInsertOrUpdate(Write value) {
+    public Builder setInsertOrUpdate(com.google.spanner.v1.Mutation.Write value) {
       if (insertOrUpdateBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -4205,7 +4325,7 @@ public Builder setInsertOrUpdate(Write value) {
      *
      * .google.spanner.v1.Mutation.Write insert_or_update = 3;
      */
-    public Builder setInsertOrUpdate(Write.Builder builderForValue) {
+    public Builder setInsertOrUpdate(com.google.spanner.v1.Mutation.Write.Builder builderForValue) {
       if (insertOrUpdateBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -4229,10 +4349,15 @@ public Builder setInsertOrUpdate(Write.Builder builderForValue) {
      *
      * .google.spanner.v1.Mutation.Write insert_or_update = 3;
      */
-    public Builder mergeInsertOrUpdate(Write value) {
+    public Builder mergeInsertOrUpdate(com.google.spanner.v1.Mutation.Write value) {
       if (insertOrUpdateBuilder_ == null) {
-        if (operationCase_ == 3 && operation_ != Write.getDefaultInstance()) {
-          operation_ = Write.newBuilder((Write) operation_).mergeFrom(value).buildPartial();
+        if (operationCase_ == 3
+            && operation_ != com.google.spanner.v1.Mutation.Write.getDefaultInstance()) {
+          operation_ =
+              com.google.spanner.v1.Mutation.Write.newBuilder(
+                      (com.google.spanner.v1.Mutation.Write) operation_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           operation_ = value;
         }
@@ -4290,7 +4415,7 @@ public Builder clearInsertOrUpdate() {
      *
      * .google.spanner.v1.Mutation.Write insert_or_update = 3;
      */
-    public Write.Builder getInsertOrUpdateBuilder() {
+    public com.google.spanner.v1.Mutation.Write.Builder getInsertOrUpdateBuilder() {
       return getInsertOrUpdateFieldBuilder().getBuilder();
     }
     /**
@@ -4307,15 +4432,15 @@ public Write.Builder getInsertOrUpdateBuilder() {
      *
      * .google.spanner.v1.Mutation.Write insert_or_update = 3;
      */
-    @Override
-    public WriteOrBuilder getInsertOrUpdateOrBuilder() {
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrUpdateOrBuilder() {
       if ((operationCase_ == 3) && (insertOrUpdateBuilder_ != null)) {
         return insertOrUpdateBuilder_.getMessageOrBuilder();
       } else {
         if (operationCase_ == 3) {
-          return (Write) operation_;
+          return (com.google.spanner.v1.Mutation.Write) operation_;
         }
-        return Write.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       }
     }
     /**
@@ -4332,15 +4457,23 @@ public WriteOrBuilder getInsertOrUpdateOrBuilder() {
      *
      * .google.spanner.v1.Mutation.Write insert_or_update = 3;
      */
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Mutation.Write,
+            com.google.spanner.v1.Mutation.Write.Builder,
+            com.google.spanner.v1.Mutation.WriteOrBuilder>
         getInsertOrUpdateFieldBuilder() {
       if (insertOrUpdateBuilder_ == null) {
         if (!(operationCase_ == 3)) {
-          operation_ = Write.getDefaultInstance();
+          operation_ = com.google.spanner.v1.Mutation.Write.getDefaultInstance();
         }
         insertOrUpdateBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3(
-                (Write) operation_, getParentForChildren(), isClean());
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.spanner.v1.Mutation.Write,
+                com.google.spanner.v1.Mutation.Write.Builder,
+                com.google.spanner.v1.Mutation.WriteOrBuilder>(
+                (com.google.spanner.v1.Mutation.Write) operation_,
+                getParentForChildren(),
+                isClean());
         operation_ = null;
       }
       operationCase_ = 3;
@@ -4349,7 +4482,10 @@ public WriteOrBuilder getInsertOrUpdateOrBuilder() {
       return insertOrUpdateBuilder_;
     }
 
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Mutation.Write,
+            com.google.spanner.v1.Mutation.Write.Builder,
+            com.google.spanner.v1.Mutation.WriteOrBuilder>
         replaceBuilder_;
     /**
      *
@@ -4369,7 +4505,7 @@ public WriteOrBuilder getInsertOrUpdateOrBuilder() {
      *
      * @return Whether the replace field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasReplace() {
       return operationCase_ == 4;
     }
@@ -4391,18 +4527,18 @@ public boolean hasReplace() {
      *
      * @return The replace.
      */
-    @Override
-    public Write getReplace() {
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation.Write getReplace() {
       if (replaceBuilder_ == null) {
         if (operationCase_ == 4) {
-          return (Write) operation_;
+          return (com.google.spanner.v1.Mutation.Write) operation_;
         }
-        return Write.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       } else {
         if (operationCase_ == 4) {
           return replaceBuilder_.getMessage();
         }
-        return Write.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       }
     }
     /**
@@ -4421,7 +4557,7 @@ public Write getReplace() {
      *
      * .google.spanner.v1.Mutation.Write replace = 4;
      */
-    public Builder setReplace(Write value) {
+    public Builder setReplace(com.google.spanner.v1.Mutation.Write value) {
       if (replaceBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -4450,7 +4586,7 @@ public Builder setReplace(Write value) {
      *
      * .google.spanner.v1.Mutation.Write replace = 4;
      */
-    public Builder setReplace(Write.Builder builderForValue) {
+    public Builder setReplace(com.google.spanner.v1.Mutation.Write.Builder builderForValue) {
       if (replaceBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -4476,10 +4612,15 @@ public Builder setReplace(Write.Builder builderForValue) {
      *
      * .google.spanner.v1.Mutation.Write replace = 4;
      */
-    public Builder mergeReplace(Write value) {
+    public Builder mergeReplace(com.google.spanner.v1.Mutation.Write value) {
       if (replaceBuilder_ == null) {
-        if (operationCase_ == 4 && operation_ != Write.getDefaultInstance()) {
-          operation_ = Write.newBuilder((Write) operation_).mergeFrom(value).buildPartial();
+        if (operationCase_ == 4
+            && operation_ != com.google.spanner.v1.Mutation.Write.getDefaultInstance()) {
+          operation_ =
+              com.google.spanner.v1.Mutation.Write.newBuilder(
+                      (com.google.spanner.v1.Mutation.Write) operation_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           operation_ = value;
         }
@@ -4541,7 +4682,7 @@ public Builder clearReplace() {
      *
      * .google.spanner.v1.Mutation.Write replace = 4;
      */
-    public Write.Builder getReplaceBuilder() {
+    public com.google.spanner.v1.Mutation.Write.Builder getReplaceBuilder() {
       return getReplaceFieldBuilder().getBuilder();
     }
     /**
@@ -4560,15 +4701,15 @@ public Write.Builder getReplaceBuilder() {
      *
      * .google.spanner.v1.Mutation.Write replace = 4;
      */
-    @Override
-    public WriteOrBuilder getReplaceOrBuilder() {
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation.WriteOrBuilder getReplaceOrBuilder() {
       if ((operationCase_ == 4) && (replaceBuilder_ != null)) {
         return replaceBuilder_.getMessageOrBuilder();
       } else {
         if (operationCase_ == 4) {
-          return (Write) operation_;
+          return (com.google.spanner.v1.Mutation.Write) operation_;
         }
-        return Write.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       }
     }
     /**
@@ -4587,15 +4728,23 @@ public WriteOrBuilder getReplaceOrBuilder() {
      *
      * .google.spanner.v1.Mutation.Write replace = 4;
      */
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Mutation.Write,
+            com.google.spanner.v1.Mutation.Write.Builder,
+            com.google.spanner.v1.Mutation.WriteOrBuilder>
         getReplaceFieldBuilder() {
       if (replaceBuilder_ == null) {
         if (!(operationCase_ == 4)) {
-          operation_ = Write.getDefaultInstance();
+          operation_ = com.google.spanner.v1.Mutation.Write.getDefaultInstance();
         }
         replaceBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3(
-                (Write) operation_, getParentForChildren(), isClean());
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.spanner.v1.Mutation.Write,
+                com.google.spanner.v1.Mutation.Write.Builder,
+                com.google.spanner.v1.Mutation.WriteOrBuilder>(
+                (com.google.spanner.v1.Mutation.Write) operation_,
+                getParentForChildren(),
+                isClean());
         operation_ = null;
       }
       operationCase_ = 4;
@@ -4604,7 +4753,10 @@ public WriteOrBuilder getReplaceOrBuilder() {
       return replaceBuilder_;
     }
 
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Mutation.Delete,
+            com.google.spanner.v1.Mutation.Delete.Builder,
+            com.google.spanner.v1.Mutation.DeleteOrBuilder>
         deleteBuilder_;
     /**
      *
@@ -4618,7 +4770,7 @@ public WriteOrBuilder getReplaceOrBuilder() {
      *
      * @return Whether the delete field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasDelete() {
       return operationCase_ == 5;
     }
@@ -4634,18 +4786,18 @@ public boolean hasDelete() {
      *
      * @return The delete.
      */
-    @Override
-    public Delete getDelete() {
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation.Delete getDelete() {
       if (deleteBuilder_ == null) {
         if (operationCase_ == 5) {
-          return (Delete) operation_;
+          return (com.google.spanner.v1.Mutation.Delete) operation_;
         }
-        return Delete.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
       } else {
         if (operationCase_ == 5) {
           return deleteBuilder_.getMessage();
         }
-        return Delete.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
       }
     }
     /**
@@ -4658,7 +4810,7 @@ public Delete getDelete() {
      *
      * .google.spanner.v1.Mutation.Delete delete = 5;
      */
-    public Builder setDelete(Delete value) {
+    public Builder setDelete(com.google.spanner.v1.Mutation.Delete value) {
       if (deleteBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -4681,7 +4833,7 @@ public Builder setDelete(Delete value) {
      *
      * .google.spanner.v1.Mutation.Delete delete = 5;
      */
-    public Builder setDelete(Delete.Builder builderForValue) {
+    public Builder setDelete(com.google.spanner.v1.Mutation.Delete.Builder builderForValue) {
       if (deleteBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -4701,10 +4853,15 @@ public Builder setDelete(Delete.Builder builderForValue) {
      *
      * .google.spanner.v1.Mutation.Delete delete = 5;
      */
-    public Builder mergeDelete(Delete value) {
+    public Builder mergeDelete(com.google.spanner.v1.Mutation.Delete value) {
       if (deleteBuilder_ == null) {
-        if (operationCase_ == 5 && operation_ != Delete.getDefaultInstance()) {
-          operation_ = Delete.newBuilder((Delete) operation_).mergeFrom(value).buildPartial();
+        if (operationCase_ == 5
+            && operation_ != com.google.spanner.v1.Mutation.Delete.getDefaultInstance()) {
+          operation_ =
+              com.google.spanner.v1.Mutation.Delete.newBuilder(
+                      (com.google.spanner.v1.Mutation.Delete) operation_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           operation_ = value;
         }
@@ -4754,7 +4911,7 @@ public Builder clearDelete() {
      *
      * .google.spanner.v1.Mutation.Delete delete = 5;
      */
-    public Delete.Builder getDeleteBuilder() {
+    public com.google.spanner.v1.Mutation.Delete.Builder getDeleteBuilder() {
       return getDeleteFieldBuilder().getBuilder();
     }
     /**
@@ -4767,15 +4924,15 @@ public Delete.Builder getDeleteBuilder() {
      *
      * .google.spanner.v1.Mutation.Delete delete = 5;
      */
-    @Override
-    public DeleteOrBuilder getDeleteOrBuilder() {
+    @java.lang.Override
+    public com.google.spanner.v1.Mutation.DeleteOrBuilder getDeleteOrBuilder() {
       if ((operationCase_ == 5) && (deleteBuilder_ != null)) {
         return deleteBuilder_.getMessageOrBuilder();
       } else {
         if (operationCase_ == 5) {
-          return (Delete) operation_;
+          return (com.google.spanner.v1.Mutation.Delete) operation_;
         }
-        return Delete.getDefaultInstance();
+        return com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
       }
     }
     /**
@@ -4788,15 +4945,23 @@ public DeleteOrBuilder getDeleteOrBuilder() {
      *
      * .google.spanner.v1.Mutation.Delete delete = 5;
      */
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Mutation.Delete,
+            com.google.spanner.v1.Mutation.Delete.Builder,
+            com.google.spanner.v1.Mutation.DeleteOrBuilder>
         getDeleteFieldBuilder() {
       if (deleteBuilder_ == null) {
         if (!(operationCase_ == 5)) {
-          operation_ = Delete.getDefaultInstance();
+          operation_ = com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
         }
         deleteBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3(
-                (Delete) operation_, getParentForChildren(), isClean());
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.spanner.v1.Mutation.Delete,
+                com.google.spanner.v1.Mutation.Delete.Builder,
+                com.google.spanner.v1.Mutation.DeleteOrBuilder>(
+                (com.google.spanner.v1.Mutation.Delete) operation_,
+                getParentForChildren(),
+                isClean());
         operation_ = null;
       }
       operationCase_ = 5;
@@ -4805,12 +4970,12 @@ public DeleteOrBuilder getDeleteOrBuilder() {
       return deleteBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4820,19 +4985,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.Mutation)
-  private static final Mutation DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.Mutation DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new Mutation();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.Mutation();
   }
 
-  public static Mutation getDefaultInstance() {
+  public static com.google.spanner.v1.Mutation getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public Mutation parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4845,13 +5010,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public Mutation getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.Mutation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationOrBuilder.java
index 609efbf18d..c91b2bbb83 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationOrBuilder.java
@@ -48,7 +48,7 @@ public interface MutationOrBuilder
    *
    * @return The insert.
    */
-  Mutation.Write getInsert();
+  com.google.spanner.v1.Mutation.Write getInsert();
   /**
    *
    *
@@ -59,7 +59,7 @@ public interface MutationOrBuilder
    *
    * .google.spanner.v1.Mutation.Write insert = 1;
    */
-  Mutation.WriteOrBuilder getInsertOrBuilder();
+  com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrBuilder();
 
   /**
    *
@@ -86,7 +86,7 @@ public interface MutationOrBuilder
    *
    * @return The update.
    */
-  Mutation.Write getUpdate();
+  com.google.spanner.v1.Mutation.Write getUpdate();
   /**
    *
    *
@@ -97,7 +97,7 @@ public interface MutationOrBuilder
    *
    * .google.spanner.v1.Mutation.Write update = 2;
    */
-  Mutation.WriteOrBuilder getUpdateOrBuilder();
+  com.google.spanner.v1.Mutation.WriteOrBuilder getUpdateOrBuilder();
 
   /**
    *
@@ -132,7 +132,7 @@ public interface MutationOrBuilder
    *
    * @return The insertOrUpdate.
    */
-  Mutation.Write getInsertOrUpdate();
+  com.google.spanner.v1.Mutation.Write getInsertOrUpdate();
   /**
    *
    *
@@ -147,7 +147,7 @@ public interface MutationOrBuilder
    *
    * .google.spanner.v1.Mutation.Write insert_or_update = 3;
    */
-  Mutation.WriteOrBuilder getInsertOrUpdateOrBuilder();
+  com.google.spanner.v1.Mutation.WriteOrBuilder getInsertOrUpdateOrBuilder();
 
   /**
    *
@@ -186,7 +186,7 @@ public interface MutationOrBuilder
    *
    * @return The replace.
    */
-  Mutation.Write getReplace();
+  com.google.spanner.v1.Mutation.Write getReplace();
   /**
    *
    *
@@ -203,7 +203,7 @@ public interface MutationOrBuilder
    *
    * .google.spanner.v1.Mutation.Write replace = 4;
    */
-  Mutation.WriteOrBuilder getReplaceOrBuilder();
+  com.google.spanner.v1.Mutation.WriteOrBuilder getReplaceOrBuilder();
 
   /**
    *
@@ -230,7 +230,7 @@ public interface MutationOrBuilder
    *
    * @return The delete.
    */
-  Mutation.Delete getDelete();
+  com.google.spanner.v1.Mutation.Delete getDelete();
   /**
    *
    *
@@ -241,7 +241,7 @@ public interface MutationOrBuilder
    *
    * .google.spanner.v1.Mutation.Delete delete = 5;
    */
-  Mutation.DeleteOrBuilder getDeleteOrBuilder();
+  com.google.spanner.v1.Mutation.DeleteOrBuilder getDeleteOrBuilder();
 
-  public Mutation.OperationCase getOperationCase();
+  public com.google.spanner.v1.Mutation.OperationCase getOperationCase();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java
index 0e1f5ab4d8..27ce2b4f3a 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java
@@ -47,7 +47,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
   static {
-    String[] descriptorData = {
+    java.lang.String[] descriptorData = {
       "\n google/spanner/v1/mutation.proto\022\021goog"
           + "le.spanner.v1\032\034google/protobuf/struct.pr"
           + "oto\032\034google/spanner/v1/keys.proto\032\034googl"
@@ -74,7 +74,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.protobuf.StructProto.getDescriptor(),
-              KeysProto.getDescriptor(),
+              com.google.spanner.v1.KeysProto.getDescriptor(),
               com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_spanner_v1_Mutation_descriptor =
@@ -82,7 +82,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_Mutation_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_Mutation_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Insert", "Update", "InsertOrUpdate", "Replace", "Delete", "Operation",
             });
     internal_static_google_spanner_v1_Mutation_Write_descriptor =
@@ -90,7 +90,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_Mutation_Write_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_Mutation_Write_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Table", "Columns", "Values",
             });
     internal_static_google_spanner_v1_Mutation_Delete_descriptor =
@@ -98,11 +98,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_Mutation_Delete_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_Mutation_Delete_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Table", "KeySet",
             });
     com.google.protobuf.StructProto.getDescriptor();
-    KeysProto.getDescriptor();
+    com.google.spanner.v1.KeysProto.getDescriptor();
     com.google.api.AnnotationsProto.getDescriptor();
   }
 
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java
index cf4504a92f..4caabb2902 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java
@@ -44,13 +44,13 @@ private PartialResultSet() {
     resumeToken_ = com.google.protobuf.ByteString.EMPTY;
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PartialResultSet();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -61,7 +61,7 @@ private PartialResultSet(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -76,11 +76,13 @@ private PartialResultSet(
             break;
           case 10:
             {
-              ResultSetMetadata.Builder subBuilder = null;
+              com.google.spanner.v1.ResultSetMetadata.Builder subBuilder = null;
               if (metadata_ != null) {
                 subBuilder = metadata_.toBuilder();
               }
-              metadata_ = input.readMessage(ResultSetMetadata.parser(), extensionRegistry);
+              metadata_ =
+                  input.readMessage(
+                      com.google.spanner.v1.ResultSetMetadata.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(metadata_);
                 metadata_ = subBuilder.buildPartial();
@@ -109,11 +111,13 @@ private PartialResultSet(
             }
           case 42:
             {
-              ResultSetStats.Builder subBuilder = null;
+              com.google.spanner.v1.ResultSetStats.Builder subBuilder = null;
               if (stats_ != null) {
                 subBuilder = stats_.toBuilder();
               }
-              stats_ = input.readMessage(ResultSetStats.parser(), extensionRegistry);
+              stats_ =
+                  input.readMessage(
+                      com.google.spanner.v1.ResultSetStats.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(stats_);
                 stats_ = subBuilder.buildPartial();
@@ -144,17 +148,22 @@ private PartialResultSet(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_descriptor;
+    return com.google.spanner.v1.ResultSetProto
+        .internal_static_google_spanner_v1_PartialResultSet_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(PartialResultSet.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.ResultSetProto
+        .internal_static_google_spanner_v1_PartialResultSet_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.PartialResultSet.class,
+            com.google.spanner.v1.PartialResultSet.Builder.class);
   }
 
   public static final int METADATA_FIELD_NUMBER = 1;
-  private ResultSetMetadata metadata_;
+  private com.google.spanner.v1.ResultSetMetadata metadata_;
   /**
    *
    *
@@ -167,7 +176,7 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return Whether the metadata field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasMetadata() {
     return metadata_ != null;
   }
@@ -183,9 +192,11 @@ public boolean hasMetadata() {
    *
    * @return The metadata.
    */
-  @Override
-  public ResultSetMetadata getMetadata() {
-    return metadata_ == null ? ResultSetMetadata.getDefaultInstance() : metadata_;
+  @java.lang.Override
+  public com.google.spanner.v1.ResultSetMetadata getMetadata() {
+    return metadata_ == null
+        ? com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()
+        : metadata_;
   }
   /**
    *
@@ -197,8 +208,8 @@ public ResultSetMetadata getMetadata() {
    *
    * .google.spanner.v1.ResultSetMetadata metadata = 1;
    */
-  @Override
-  public ResultSetMetadataOrBuilder getMetadataOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() {
     return getMetadata();
   }
 
@@ -271,7 +282,7 @@ public ResultSetMetadataOrBuilder getMetadataOrBuilder() {
    *
    * repeated .google.protobuf.Value values = 2;
    */
-  @Override
+  @java.lang.Override
   public java.util.List getValuesList() {
     return values_;
   }
@@ -342,7 +353,7 @@ public java.util.List getValuesList() {
    *
    * repeated .google.protobuf.Value values = 2;
    */
-  @Override
+  @java.lang.Override
   public java.util.List getValuesOrBuilderList() {
     return values_;
   }
@@ -413,7 +424,7 @@ public java.util.List getValuesOrB
    *
    * repeated .google.protobuf.Value values = 2;
    */
-  @Override
+  @java.lang.Override
   public int getValuesCount() {
     return values_.size();
   }
@@ -484,7 +495,7 @@ public int getValuesCount() {
    *
    * repeated .google.protobuf.Value values = 2;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Value getValues(int index) {
     return values_.get(index);
   }
@@ -555,7 +566,7 @@ public com.google.protobuf.Value getValues(int index) {
    *
    * repeated .google.protobuf.Value values = 2;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ValueOrBuilder getValuesOrBuilder(int index) {
     return values_.get(index);
   }
@@ -575,7 +586,7 @@ public com.google.protobuf.ValueOrBuilder getValuesOrBuilder(int index) {
    *
    * @return The chunkedValue.
    */
-  @Override
+  @java.lang.Override
   public boolean getChunkedValue() {
     return chunkedValue_;
   }
@@ -597,13 +608,13 @@ public boolean getChunkedValue() {
    *
    * @return The resumeToken.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getResumeToken() {
     return resumeToken_;
   }
 
   public static final int STATS_FIELD_NUMBER = 5;
-  private ResultSetStats stats_;
+  private com.google.spanner.v1.ResultSetStats stats_;
   /**
    *
    *
@@ -620,7 +631,7 @@ public com.google.protobuf.ByteString getResumeToken() {
    *
    * @return Whether the stats field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasStats() {
     return stats_ != null;
   }
@@ -640,9 +651,9 @@ public boolean hasStats() {
    *
    * @return The stats.
    */
-  @Override
-  public ResultSetStats getStats() {
-    return stats_ == null ? ResultSetStats.getDefaultInstance() : stats_;
+  @java.lang.Override
+  public com.google.spanner.v1.ResultSetStats getStats() {
+    return stats_ == null ? com.google.spanner.v1.ResultSetStats.getDefaultInstance() : stats_;
   }
   /**
    *
@@ -658,14 +669,14 @@ public ResultSetStats getStats() {
    *
    * .google.spanner.v1.ResultSetStats stats = 5;
    */
-  @Override
-  public ResultSetStatsOrBuilder getStatsOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
     return getStats();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -675,7 +686,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (metadata_ != null) {
       output.writeMessage(1, getMetadata());
@@ -695,7 +706,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -721,15 +732,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof PartialResultSet)) {
+    if (!(obj instanceof com.google.spanner.v1.PartialResultSet)) {
       return super.equals(obj);
     }
-    PartialResultSet other = (PartialResultSet) obj;
+    com.google.spanner.v1.PartialResultSet other = (com.google.spanner.v1.PartialResultSet) obj;
 
     if (hasMetadata() != other.hasMetadata()) return false;
     if (hasMetadata()) {
@@ -746,7 +757,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -774,69 +785,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static PartialResultSet parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.PartialResultSet parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartialResultSet parseFrom(
+  public static com.google.spanner.v1.PartialResultSet parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartialResultSet parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.PartialResultSet parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartialResultSet parseFrom(
+  public static com.google.spanner.v1.PartialResultSet parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartialResultSet parseFrom(byte[] data)
+  public static com.google.spanner.v1.PartialResultSet parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartialResultSet parseFrom(
+  public static com.google.spanner.v1.PartialResultSet parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartialResultSet parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.PartialResultSet parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static PartialResultSet parseFrom(
+  public static com.google.spanner.v1.PartialResultSet 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 PartialResultSet parseDelimitedFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.PartialResultSet parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static PartialResultSet parseDelimitedFrom(
+  public static com.google.spanner.v1.PartialResultSet 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 PartialResultSet parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.PartialResultSet parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static PartialResultSet parseFrom(
+  public static com.google.spanner.v1.PartialResultSet parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -844,7 +857,7 @@ public static PartialResultSet parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -853,17 +866,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(PartialResultSet prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.PartialResultSet prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -881,15 +894,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.PartialResultSet)
-      PartialResultSetOrBuilder {
+      com.google.spanner.v1.PartialResultSetOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_descriptor;
+      return com.google.spanner.v1.ResultSetProto
+          .internal_static_google_spanner_v1_PartialResultSet_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(PartialResultSet.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.ResultSetProto
+          .internal_static_google_spanner_v1_PartialResultSet_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.PartialResultSet.class,
+              com.google.spanner.v1.PartialResultSet.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.PartialResultSet.newBuilder()
@@ -897,7 +915,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -908,7 +926,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (metadataBuilder_ == null) {
@@ -936,28 +954,30 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_descriptor;
+      return com.google.spanner.v1.ResultSetProto
+          .internal_static_google_spanner_v1_PartialResultSet_descriptor;
     }
 
-    @Override
-    public PartialResultSet getDefaultInstanceForType() {
-      return PartialResultSet.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.PartialResultSet getDefaultInstanceForType() {
+      return com.google.spanner.v1.PartialResultSet.getDefaultInstance();
     }
 
-    @Override
-    public PartialResultSet build() {
-      PartialResultSet result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.PartialResultSet build() {
+      com.google.spanner.v1.PartialResultSet result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public PartialResultSet buildPartial() {
-      PartialResultSet result = new PartialResultSet(this);
+    @java.lang.Override
+    public com.google.spanner.v1.PartialResultSet buildPartial() {
+      com.google.spanner.v1.PartialResultSet result =
+          new com.google.spanner.v1.PartialResultSet(this);
       int from_bitField0_ = bitField0_;
       if (metadataBuilder_ == null) {
         result.metadata_ = metadata_;
@@ -984,50 +1004,51 @@ public PartialResultSet buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof PartialResultSet) {
-        return mergeFrom((PartialResultSet) other);
+      if (other instanceof com.google.spanner.v1.PartialResultSet) {
+        return mergeFrom((com.google.spanner.v1.PartialResultSet) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(PartialResultSet other) {
-      if (other == PartialResultSet.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.PartialResultSet other) {
+      if (other == com.google.spanner.v1.PartialResultSet.getDefaultInstance()) return this;
       if (other.hasMetadata()) {
         mergeMetadata(other.getMetadata());
       }
@@ -1072,21 +1093,21 @@ public Builder mergeFrom(PartialResultSet other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      PartialResultSet parsedMessage = null;
+      com.google.spanner.v1.PartialResultSet parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (PartialResultSet) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.PartialResultSet) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -1098,9 +1119,11 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private ResultSetMetadata metadata_;
+    private com.google.spanner.v1.ResultSetMetadata metadata_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            ResultSetMetadata, ResultSetMetadata.Builder, ResultSetMetadataOrBuilder>
+            com.google.spanner.v1.ResultSetMetadata,
+            com.google.spanner.v1.ResultSetMetadata.Builder,
+            com.google.spanner.v1.ResultSetMetadataOrBuilder>
         metadataBuilder_;
     /**
      *
@@ -1129,9 +1152,11 @@ public boolean hasMetadata() {
      *
      * @return The metadata.
      */
-    public ResultSetMetadata getMetadata() {
+    public com.google.spanner.v1.ResultSetMetadata getMetadata() {
       if (metadataBuilder_ == null) {
-        return metadata_ == null ? ResultSetMetadata.getDefaultInstance() : metadata_;
+        return metadata_ == null
+            ? com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()
+            : metadata_;
       } else {
         return metadataBuilder_.getMessage();
       }
@@ -1146,7 +1171,7 @@ public ResultSetMetadata getMetadata() {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public Builder setMetadata(ResultSetMetadata value) {
+    public Builder setMetadata(com.google.spanner.v1.ResultSetMetadata value) {
       if (metadataBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1169,7 +1194,7 @@ public Builder setMetadata(ResultSetMetadata value) {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public Builder setMetadata(ResultSetMetadata.Builder builderForValue) {
+    public Builder setMetadata(com.google.spanner.v1.ResultSetMetadata.Builder builderForValue) {
       if (metadataBuilder_ == null) {
         metadata_ = builderForValue.build();
         onChanged();
@@ -1189,10 +1214,13 @@ public Builder setMetadata(ResultSetMetadata.Builder builderForValue) {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public Builder mergeMetadata(ResultSetMetadata value) {
+    public Builder mergeMetadata(com.google.spanner.v1.ResultSetMetadata value) {
       if (metadataBuilder_ == null) {
         if (metadata_ != null) {
-          metadata_ = ResultSetMetadata.newBuilder(metadata_).mergeFrom(value).buildPartial();
+          metadata_ =
+              com.google.spanner.v1.ResultSetMetadata.newBuilder(metadata_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           metadata_ = value;
         }
@@ -1234,7 +1262,7 @@ public Builder clearMetadata() {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public ResultSetMetadata.Builder getMetadataBuilder() {
+    public com.google.spanner.v1.ResultSetMetadata.Builder getMetadataBuilder() {
 
       onChanged();
       return getMetadataFieldBuilder().getBuilder();
@@ -1249,11 +1277,13 @@ public ResultSetMetadata.Builder getMetadataBuilder() {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public ResultSetMetadataOrBuilder getMetadataOrBuilder() {
+    public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() {
       if (metadataBuilder_ != null) {
         return metadataBuilder_.getMessageOrBuilder();
       } else {
-        return metadata_ == null ? ResultSetMetadata.getDefaultInstance() : metadata_;
+        return metadata_ == null
+            ? com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()
+            : metadata_;
       }
     }
     /**
@@ -1267,12 +1297,16 @@ public ResultSetMetadataOrBuilder getMetadataOrBuilder() {
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            ResultSetMetadata, ResultSetMetadata.Builder, ResultSetMetadataOrBuilder>
+            com.google.spanner.v1.ResultSetMetadata,
+            com.google.spanner.v1.ResultSetMetadata.Builder,
+            com.google.spanner.v1.ResultSetMetadataOrBuilder>
         getMetadataFieldBuilder() {
       if (metadataBuilder_ == null) {
         metadataBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                ResultSetMetadata, ResultSetMetadata.Builder, ResultSetMetadataOrBuilder>(
+                com.google.spanner.v1.ResultSetMetadata,
+                com.google.spanner.v1.ResultSetMetadata.Builder,
+                com.google.spanner.v1.ResultSetMetadataOrBuilder>(
                 getMetadata(), getParentForChildren(), isClean());
         metadata_ = null;
       }
@@ -2054,7 +2088,7 @@ public Builder addValues(int index, com.google.protobuf.Value.Builder builderFor
      *
      * repeated .google.protobuf.Value values = 2;
      */
-    public Builder addAllValues(Iterable values) {
+    public Builder addAllValues(java.lang.Iterable values) {
       if (valuesBuilder_ == null) {
         ensureValuesIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, values_);
@@ -2679,7 +2713,7 @@ public java.util.List getValuesBuilderList()
      *
      * @return The chunkedValue.
      */
-    @Override
+    @java.lang.Override
     public boolean getChunkedValue() {
       return chunkedValue_;
     }
@@ -2739,7 +2773,7 @@ public Builder clearChunkedValue() {
      *
      * @return The resumeToken.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ByteString getResumeToken() {
       return resumeToken_;
     }
@@ -2790,9 +2824,11 @@ public Builder clearResumeToken() {
       return this;
     }
 
-    private ResultSetStats stats_;
+    private com.google.spanner.v1.ResultSetStats stats_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            ResultSetStats, ResultSetStats.Builder, ResultSetStatsOrBuilder>
+            com.google.spanner.v1.ResultSetStats,
+            com.google.spanner.v1.ResultSetStats.Builder,
+            com.google.spanner.v1.ResultSetStatsOrBuilder>
         statsBuilder_;
     /**
      *
@@ -2829,9 +2865,9 @@ public boolean hasStats() {
      *
      * @return The stats.
      */
-    public ResultSetStats getStats() {
+    public com.google.spanner.v1.ResultSetStats getStats() {
       if (statsBuilder_ == null) {
-        return stats_ == null ? ResultSetStats.getDefaultInstance() : stats_;
+        return stats_ == null ? com.google.spanner.v1.ResultSetStats.getDefaultInstance() : stats_;
       } else {
         return statsBuilder_.getMessage();
       }
@@ -2850,7 +2886,7 @@ public ResultSetStats getStats() {
      *
      * .google.spanner.v1.ResultSetStats stats = 5;
      */
-    public Builder setStats(ResultSetStats value) {
+    public Builder setStats(com.google.spanner.v1.ResultSetStats value) {
       if (statsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2877,7 +2913,7 @@ public Builder setStats(ResultSetStats value) {
      *
      * .google.spanner.v1.ResultSetStats stats = 5;
      */
-    public Builder setStats(ResultSetStats.Builder builderForValue) {
+    public Builder setStats(com.google.spanner.v1.ResultSetStats.Builder builderForValue) {
       if (statsBuilder_ == null) {
         stats_ = builderForValue.build();
         onChanged();
@@ -2901,10 +2937,13 @@ public Builder setStats(ResultSetStats.Builder builderForValue) {
      *
      * .google.spanner.v1.ResultSetStats stats = 5;
      */
-    public Builder mergeStats(ResultSetStats value) {
+    public Builder mergeStats(com.google.spanner.v1.ResultSetStats value) {
       if (statsBuilder_ == null) {
         if (stats_ != null) {
-          stats_ = ResultSetStats.newBuilder(stats_).mergeFrom(value).buildPartial();
+          stats_ =
+              com.google.spanner.v1.ResultSetStats.newBuilder(stats_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           stats_ = value;
         }
@@ -2954,7 +2993,7 @@ public Builder clearStats() {
      *
      * .google.spanner.v1.ResultSetStats stats = 5;
      */
-    public ResultSetStats.Builder getStatsBuilder() {
+    public com.google.spanner.v1.ResultSetStats.Builder getStatsBuilder() {
 
       onChanged();
       return getStatsFieldBuilder().getBuilder();
@@ -2973,11 +3012,11 @@ public ResultSetStats.Builder getStatsBuilder() {
      *
      * .google.spanner.v1.ResultSetStats stats = 5;
      */
-    public ResultSetStatsOrBuilder getStatsOrBuilder() {
+    public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
       if (statsBuilder_ != null) {
         return statsBuilder_.getMessageOrBuilder();
       } else {
-        return stats_ == null ? ResultSetStats.getDefaultInstance() : stats_;
+        return stats_ == null ? com.google.spanner.v1.ResultSetStats.getDefaultInstance() : stats_;
       }
     }
     /**
@@ -2995,24 +3034,28 @@ public ResultSetStatsOrBuilder getStatsOrBuilder() {
      * .google.spanner.v1.ResultSetStats stats = 5;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            ResultSetStats, ResultSetStats.Builder, ResultSetStatsOrBuilder>
+            com.google.spanner.v1.ResultSetStats,
+            com.google.spanner.v1.ResultSetStats.Builder,
+            com.google.spanner.v1.ResultSetStatsOrBuilder>
         getStatsFieldBuilder() {
       if (statsBuilder_ == null) {
         statsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                ResultSetStats, ResultSetStats.Builder, ResultSetStatsOrBuilder>(
+                com.google.spanner.v1.ResultSetStats,
+                com.google.spanner.v1.ResultSetStats.Builder,
+                com.google.spanner.v1.ResultSetStatsOrBuilder>(
                 getStats(), getParentForChildren(), isClean());
         stats_ = null;
       }
       return statsBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3022,19 +3065,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.PartialResultSet)
-  private static final PartialResultSet DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.PartialResultSet DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new PartialResultSet();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.PartialResultSet();
   }
 
-  public static PartialResultSet getDefaultInstance() {
+  public static com.google.spanner.v1.PartialResultSet getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public PartialResultSet parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3047,13 +3090,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public PartialResultSet getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.PartialResultSet getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSetOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSetOrBuilder.java
index 546a592f39..60b851170f 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSetOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSetOrBuilder.java
@@ -48,7 +48,7 @@ public interface PartialResultSetOrBuilder
    *
    * @return The metadata.
    */
-  ResultSetMetadata getMetadata();
+  com.google.spanner.v1.ResultSetMetadata getMetadata();
   /**
    *
    *
@@ -59,7 +59,7 @@ public interface PartialResultSetOrBuilder
    *
    * .google.spanner.v1.ResultSetMetadata metadata = 1;
    */
-  ResultSetMetadataOrBuilder getMetadataOrBuilder();
+  com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder();
 
   /**
    *
@@ -467,7 +467,7 @@ public interface PartialResultSetOrBuilder
    *
    * @return The stats.
    */
-  ResultSetStats getStats();
+  com.google.spanner.v1.ResultSetStats getStats();
   /**
    *
    *
@@ -482,5 +482,5 @@ public interface PartialResultSetOrBuilder
    *
    * .google.spanner.v1.ResultSetStats stats = 5;
    */
-  ResultSetStatsOrBuilder getStatsOrBuilder();
+  com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java
index f81bf09e78..6c366b815b 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java
@@ -42,13 +42,13 @@ private Partition() {
     partitionToken_ = com.google.protobuf.ByteString.EMPTY;
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Partition();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private Partition(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -96,13 +96,17 @@ private Partition(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_Partition_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_Partition_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto.internal_static_google_spanner_v1_Partition_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(Partition.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_Partition_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.Partition.class, com.google.spanner.v1.Partition.Builder.class);
   }
 
   public static final int PARTITION_TOKEN_FIELD_NUMBER = 1;
@@ -120,14 +124,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return The partitionToken.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getPartitionToken() {
     return partitionToken_;
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -137,7 +141,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!partitionToken_.isEmpty()) {
       output.writeBytes(1, partitionToken_);
@@ -145,7 +149,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -159,22 +163,22 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof Partition)) {
+    if (!(obj instanceof com.google.spanner.v1.Partition)) {
       return super.equals(obj);
     }
-    Partition other = (Partition) obj;
+    com.google.spanner.v1.Partition other = (com.google.spanner.v1.Partition) obj;
 
     if (!getPartitionToken().equals(other.getPartitionToken())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -188,68 +192,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static Partition parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.Partition parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Partition parseFrom(
+  public static com.google.spanner.v1.Partition parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Partition parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.Partition parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Partition parseFrom(
+  public static com.google.spanner.v1.Partition parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Partition parseFrom(byte[] data)
+  public static com.google.spanner.v1.Partition parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Partition parseFrom(
+  public static com.google.spanner.v1.Partition parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Partition parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.Partition parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static Partition parseFrom(
+  public static com.google.spanner.v1.Partition 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 Partition parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.Partition parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static Partition parseDelimitedFrom(
+  public static com.google.spanner.v1.Partition 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 Partition parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.Partition parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static Partition parseFrom(
+  public static com.google.spanner.v1.Partition parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -257,7 +263,7 @@ public static Partition parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -266,17 +272,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(Partition prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.Partition prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -293,15 +299,19 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.Partition)
-      PartitionOrBuilder {
+      com.google.spanner.v1.PartitionOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_Partition_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_Partition_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto.internal_static_google_spanner_v1_Partition_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(Partition.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_Partition_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.Partition.class, com.google.spanner.v1.Partition.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.Partition.newBuilder()
@@ -309,7 +319,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -318,7 +328,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       partitionToken_ = com.google.protobuf.ByteString.EMPTY;
@@ -326,77 +336,79 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_Partition_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_Partition_descriptor;
     }
 
-    @Override
-    public Partition getDefaultInstanceForType() {
-      return Partition.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.Partition getDefaultInstanceForType() {
+      return com.google.spanner.v1.Partition.getDefaultInstance();
     }
 
-    @Override
-    public Partition build() {
-      Partition result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.Partition build() {
+      com.google.spanner.v1.Partition result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public Partition buildPartial() {
-      Partition result = new Partition(this);
+    @java.lang.Override
+    public com.google.spanner.v1.Partition buildPartial() {
+      com.google.spanner.v1.Partition result = new com.google.spanner.v1.Partition(this);
       result.partitionToken_ = partitionToken_;
       onBuilt();
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof Partition) {
-        return mergeFrom((Partition) other);
+      if (other instanceof com.google.spanner.v1.Partition) {
+        return mergeFrom((com.google.spanner.v1.Partition) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(Partition other) {
-      if (other == Partition.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.Partition other) {
+      if (other == com.google.spanner.v1.Partition.getDefaultInstance()) return this;
       if (other.getPartitionToken() != com.google.protobuf.ByteString.EMPTY) {
         setPartitionToken(other.getPartitionToken());
       }
@@ -405,21 +417,21 @@ public Builder mergeFrom(Partition other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Partition parsedMessage = null;
+      com.google.spanner.v1.Partition parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (Partition) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.Partition) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -443,7 +455,7 @@ public Builder mergeFrom(
      *
      * @return The partitionToken.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ByteString getPartitionToken() {
       return partitionToken_;
     }
@@ -490,12 +502,12 @@ public Builder clearPartitionToken() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -505,19 +517,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.Partition)
-  private static final Partition DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.Partition DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new Partition();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.Partition();
   }
 
-  public static Partition getDefaultInstance() {
+  public static com.google.spanner.v1.Partition getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public Partition parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -530,13 +542,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public Partition getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.Partition getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java
index 358de1863e..9f51c4c833 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java
@@ -40,13 +40,13 @@ private PartitionOptions(com.google.protobuf.GeneratedMessageV3.Builder build
 
   private PartitionOptions() {}
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PartitionOptions();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -57,7 +57,7 @@ private PartitionOptions(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -99,13 +99,18 @@ private PartitionOptions(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_PartitionOptions_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_PartitionOptions_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto.internal_static_google_spanner_v1_PartitionOptions_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(PartitionOptions.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_PartitionOptions_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.PartitionOptions.class,
+            com.google.spanner.v1.PartitionOptions.Builder.class);
   }
 
   public static final int PARTITION_SIZE_BYTES_FIELD_NUMBER = 1;
@@ -125,7 +130,7 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return The partitionSizeBytes.
    */
-  @Override
+  @java.lang.Override
   public long getPartitionSizeBytes() {
     return partitionSizeBytes_;
   }
@@ -149,14 +154,14 @@ public long getPartitionSizeBytes() {
    *
    * @return The maxPartitions.
    */
-  @Override
+  @java.lang.Override
   public long getMaxPartitions() {
     return maxPartitions_;
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -166,7 +171,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (partitionSizeBytes_ != 0L) {
       output.writeInt64(1, partitionSizeBytes_);
@@ -177,7 +182,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -194,15 +199,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof PartitionOptions)) {
+    if (!(obj instanceof com.google.spanner.v1.PartitionOptions)) {
       return super.equals(obj);
     }
-    PartitionOptions other = (PartitionOptions) obj;
+    com.google.spanner.v1.PartitionOptions other = (com.google.spanner.v1.PartitionOptions) obj;
 
     if (getPartitionSizeBytes() != other.getPartitionSizeBytes()) return false;
     if (getMaxPartitions() != other.getMaxPartitions()) return false;
@@ -210,7 +215,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -226,69 +231,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static PartitionOptions parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.PartitionOptions parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartitionOptions parseFrom(
+  public static com.google.spanner.v1.PartitionOptions parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartitionOptions parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.PartitionOptions parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartitionOptions parseFrom(
+  public static com.google.spanner.v1.PartitionOptions parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartitionOptions parseFrom(byte[] data)
+  public static com.google.spanner.v1.PartitionOptions parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartitionOptions parseFrom(
+  public static com.google.spanner.v1.PartitionOptions parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartitionOptions parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.PartitionOptions parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static PartitionOptions parseFrom(
+  public static com.google.spanner.v1.PartitionOptions 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 PartitionOptions parseDelimitedFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.PartitionOptions parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static PartitionOptions parseDelimitedFrom(
+  public static com.google.spanner.v1.PartitionOptions 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 PartitionOptions parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.PartitionOptions parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static PartitionOptions parseFrom(
+  public static com.google.spanner.v1.PartitionOptions parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -296,7 +303,7 @@ public static PartitionOptions parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -305,17 +312,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(PartitionOptions prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.PartitionOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -332,15 +339,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.PartitionOptions)
-      PartitionOptionsOrBuilder {
+      com.google.spanner.v1.PartitionOptionsOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_PartitionOptions_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_PartitionOptions_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto.internal_static_google_spanner_v1_PartitionOptions_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(PartitionOptions.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_PartitionOptions_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.PartitionOptions.class,
+              com.google.spanner.v1.PartitionOptions.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.PartitionOptions.newBuilder()
@@ -348,7 +360,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -357,7 +369,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       partitionSizeBytes_ = 0L;
@@ -367,78 +379,81 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_PartitionOptions_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_PartitionOptions_descriptor;
     }
 
-    @Override
-    public PartitionOptions getDefaultInstanceForType() {
-      return PartitionOptions.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.PartitionOptions getDefaultInstanceForType() {
+      return com.google.spanner.v1.PartitionOptions.getDefaultInstance();
     }
 
-    @Override
-    public PartitionOptions build() {
-      PartitionOptions result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.PartitionOptions build() {
+      com.google.spanner.v1.PartitionOptions result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public PartitionOptions buildPartial() {
-      PartitionOptions result = new PartitionOptions(this);
+    @java.lang.Override
+    public com.google.spanner.v1.PartitionOptions buildPartial() {
+      com.google.spanner.v1.PartitionOptions result =
+          new com.google.spanner.v1.PartitionOptions(this);
       result.partitionSizeBytes_ = partitionSizeBytes_;
       result.maxPartitions_ = maxPartitions_;
       onBuilt();
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof PartitionOptions) {
-        return mergeFrom((PartitionOptions) other);
+      if (other instanceof com.google.spanner.v1.PartitionOptions) {
+        return mergeFrom((com.google.spanner.v1.PartitionOptions) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(PartitionOptions other) {
-      if (other == PartitionOptions.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.PartitionOptions other) {
+      if (other == com.google.spanner.v1.PartitionOptions.getDefaultInstance()) return this;
       if (other.getPartitionSizeBytes() != 0L) {
         setPartitionSizeBytes(other.getPartitionSizeBytes());
       }
@@ -450,21 +465,21 @@ public Builder mergeFrom(PartitionOptions other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      PartitionOptions parsedMessage = null;
+      com.google.spanner.v1.PartitionOptions parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (PartitionOptions) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.PartitionOptions) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -490,7 +505,7 @@ public Builder mergeFrom(
      *
      * @return The partitionSizeBytes.
      */
-    @Override
+    @java.lang.Override
     public long getPartitionSizeBytes() {
       return partitionSizeBytes_;
     }
@@ -556,7 +571,7 @@ public Builder clearPartitionSizeBytes() {
      *
      * @return The maxPartitions.
      */
-    @Override
+    @java.lang.Override
     public long getMaxPartitions() {
       return maxPartitions_;
     }
@@ -608,12 +623,12 @@ public Builder clearMaxPartitions() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -623,19 +638,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.PartitionOptions)
-  private static final PartitionOptions DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.PartitionOptions DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new PartitionOptions();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.PartitionOptions();
   }
 
-  public static PartitionOptions getDefaultInstance() {
+  public static com.google.spanner.v1.PartitionOptions getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public PartitionOptions parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -648,13 +663,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public PartitionOptions getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.PartitionOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java
index 3da45a8791..f7fc78454c 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java
@@ -42,13 +42,13 @@ private PartitionQueryRequest() {
     sql_ = "";
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PartitionQueryRequest();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private PartitionQueryRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -74,18 +74,20 @@ private PartitionQueryRequest(
             break;
           case 10:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               session_ = s;
               break;
             }
           case 18:
             {
-              TransactionSelector.Builder subBuilder = null;
+              com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
               if (transaction_ != null) {
                 subBuilder = transaction_.toBuilder();
               }
-              transaction_ = input.readMessage(TransactionSelector.parser(), extensionRegistry);
+              transaction_ =
+                  input.readMessage(
+                      com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(transaction_);
                 transaction_ = subBuilder.buildPartial();
@@ -95,7 +97,7 @@ private PartitionQueryRequest(
             }
           case 26:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               sql_ = s;
               break;
@@ -122,20 +124,23 @@ private PartitionQueryRequest(
                         ParamTypesDefaultEntryHolder.defaultEntry);
                 mutable_bitField0_ |= 0x00000001;
               }
-              com.google.protobuf.MapEntry paramTypes__ =
-                  input.readMessage(
-                      ParamTypesDefaultEntryHolder.defaultEntry.getParserForType(),
-                      extensionRegistry);
+              com.google.protobuf.MapEntry
+                  paramTypes__ =
+                      input.readMessage(
+                          ParamTypesDefaultEntryHolder.defaultEntry.getParserForType(),
+                          extensionRegistry);
               paramTypes_.getMutableMap().put(paramTypes__.getKey(), paramTypes__.getValue());
               break;
             }
           case 50:
             {
-              PartitionOptions.Builder subBuilder = null;
+              com.google.spanner.v1.PartitionOptions.Builder subBuilder = null;
               if (partitionOptions_ != null) {
                 subBuilder = partitionOptions_.toBuilder();
               }
-              partitionOptions_ = input.readMessage(PartitionOptions.parser(), extensionRegistry);
+              partitionOptions_ =
+                  input.readMessage(
+                      com.google.spanner.v1.PartitionOptions.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(partitionOptions_);
                 partitionOptions_ = subBuilder.buildPartial();
@@ -163,11 +168,12 @@ private PartitionQueryRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_PartitionQueryRequest_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_PartitionQueryRequest_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
-  @Override
+  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 5:
@@ -177,14 +183,18 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto.internal_static_google_spanner_v1_PartitionQueryRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(PartitionQueryRequest.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_PartitionQueryRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.PartitionQueryRequest.class,
+            com.google.spanner.v1.PartitionQueryRequest.Builder.class);
   }
 
   public static final int SESSION_FIELD_NUMBER = 1;
-  private volatile Object session_;
+  private volatile java.lang.Object session_;
   /**
    *
    *
@@ -198,14 +208,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return The session.
    */
-  @Override
-  public String getSession() {
-    Object ref = session_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  public java.lang.String getSession() {
+    java.lang.Object ref = session_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       session_ = s;
       return s;
     }
@@ -223,11 +233,12 @@ public String getSession() {
    *
    * @return The bytes for session.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getSessionBytes() {
-    Object ref = session_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    java.lang.Object ref = session_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       session_ = b;
       return b;
     } else {
@@ -236,7 +247,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 2;
-  private TransactionSelector transaction_;
+  private com.google.spanner.v1.TransactionSelector transaction_;
   /**
    *
    *
@@ -249,7 +260,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
    *
    * @return Whether the transaction field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasTransaction() {
     return transaction_ != null;
   }
@@ -265,9 +276,11 @@ public boolean hasTransaction() {
    *
    * @return The transaction.
    */
-  @Override
-  public TransactionSelector getTransaction() {
-    return transaction_ == null ? TransactionSelector.getDefaultInstance() : transaction_;
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionSelector getTransaction() {
+    return transaction_ == null
+        ? com.google.spanner.v1.TransactionSelector.getDefaultInstance()
+        : transaction_;
   }
   /**
    *
@@ -279,13 +292,13 @@ public TransactionSelector getTransaction() {
    *
    * .google.spanner.v1.TransactionSelector transaction = 2;
    */
-  @Override
-  public TransactionSelectorOrBuilder getTransactionOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder() {
     return getTransaction();
   }
 
   public static final int SQL_FIELD_NUMBER = 3;
-  private volatile Object sql_;
+  private volatile java.lang.Object sql_;
   /**
    *
    *
@@ -305,14 +318,14 @@ public TransactionSelectorOrBuilder getTransactionOrBuilder() {
    *
    * @return The sql.
    */
-  @Override
-  public String getSql() {
-    Object ref = sql_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  public java.lang.String getSql() {
+    java.lang.Object ref = sql_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       sql_ = s;
       return s;
     }
@@ -336,11 +349,12 @@ public String getSql() {
    *
    * @return The bytes for sql.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getSqlBytes() {
-    Object ref = sql_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    java.lang.Object ref = sql_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       sql_ = b;
       return b;
     } else {
@@ -368,7 +382,7 @@ public com.google.protobuf.ByteString getSqlBytes() {
    *
    * @return Whether the params field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasParams() {
     return params_ != null;
   }
@@ -390,7 +404,7 @@ public boolean hasParams() {
    *
    * @return The params.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Struct getParams() {
     return params_ == null ? com.google.protobuf.Struct.getDefaultInstance() : params_;
   }
@@ -410,7 +424,7 @@ public com.google.protobuf.Struct getParams() {
    *
    * .google.protobuf.Struct params = 4;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
     return getParams();
   }
@@ -418,19 +432,22 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
   public static final int PARAM_TYPES_FIELD_NUMBER = 5;
 
   private static final class ParamTypesDefaultEntryHolder {
-    static final com.google.protobuf.MapEntry defaultEntry =
-        com.google.protobuf.MapEntry.newDefaultInstance(
-            SpannerProto
-                .internal_static_google_spanner_v1_PartitionQueryRequest_ParamTypesEntry_descriptor,
-            com.google.protobuf.WireFormat.FieldType.STRING,
-            "",
-            com.google.protobuf.WireFormat.FieldType.MESSAGE,
-            Type.getDefaultInstance());
+    static final com.google.protobuf.MapEntry
+        defaultEntry =
+            com.google.protobuf.MapEntry
+                .newDefaultInstance(
+                    com.google.spanner.v1.SpannerProto
+                        .internal_static_google_spanner_v1_PartitionQueryRequest_ParamTypesEntry_descriptor,
+                    com.google.protobuf.WireFormat.FieldType.STRING,
+                    "",
+                    com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                    com.google.spanner.v1.Type.getDefaultInstance());
   }
 
-  private com.google.protobuf.MapField paramTypes_;
+  private com.google.protobuf.MapField paramTypes_;
 
-  private com.google.protobuf.MapField internalGetParamTypes() {
+  private com.google.protobuf.MapField
+      internalGetParamTypes() {
     if (paramTypes_ == null) {
       return com.google.protobuf.MapField.emptyMapField(ParamTypesDefaultEntryHolder.defaultEntry);
     }
@@ -455,17 +472,17 @@ public int getParamTypesCount() {
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  @Override
-  public boolean containsParamTypes(String key) {
+  @java.lang.Override
+  public boolean containsParamTypes(java.lang.String key) {
     if (key == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     return internalGetParamTypes().getMap().containsKey(key);
   }
   /** Use {@link #getParamTypesMap()} instead. */
-  @Override
-  @Deprecated
-  public java.util.Map getParamTypes() {
+  @java.lang.Override
+  @java.lang.Deprecated
+  public java.util.Map getParamTypes() {
     return getParamTypesMap();
   }
   /**
@@ -483,8 +500,8 @@ public java.util.Map getParamTypes() {
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  @Override
-  public java.util.Map getParamTypesMap() {
+  @java.lang.Override
+  public java.util.Map getParamTypesMap() {
     return internalGetParamTypes().getMap();
   }
   /**
@@ -502,12 +519,14 @@ public java.util.Map getParamTypesMap() {
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  @Override
-  public Type getParamTypesOrDefault(String key, Type defaultValue) {
+  @java.lang.Override
+  public com.google.spanner.v1.Type getParamTypesOrDefault(
+      java.lang.String key, com.google.spanner.v1.Type defaultValue) {
     if (key == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
-    java.util.Map map = internalGetParamTypes().getMap();
+    java.util.Map map =
+        internalGetParamTypes().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
   /**
@@ -525,20 +544,21 @@ public Type getParamTypesOrDefault(String key, Type defaultValue) {
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  @Override
-  public Type getParamTypesOrThrow(String key) {
+  @java.lang.Override
+  public com.google.spanner.v1.Type getParamTypesOrThrow(java.lang.String key) {
     if (key == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
-    java.util.Map map = internalGetParamTypes().getMap();
+    java.util.Map map =
+        internalGetParamTypes().getMap();
     if (!map.containsKey(key)) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
     return map.get(key);
   }
 
   public static final int PARTITION_OPTIONS_FIELD_NUMBER = 6;
-  private PartitionOptions partitionOptions_;
+  private com.google.spanner.v1.PartitionOptions partitionOptions_;
   /**
    *
    *
@@ -550,7 +570,7 @@ public Type getParamTypesOrThrow(String key) {
    *
    * @return Whether the partitionOptions field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasPartitionOptions() {
     return partitionOptions_ != null;
   }
@@ -565,9 +585,11 @@ public boolean hasPartitionOptions() {
    *
    * @return The partitionOptions.
    */
-  @Override
-  public PartitionOptions getPartitionOptions() {
-    return partitionOptions_ == null ? PartitionOptions.getDefaultInstance() : partitionOptions_;
+  @java.lang.Override
+  public com.google.spanner.v1.PartitionOptions getPartitionOptions() {
+    return partitionOptions_ == null
+        ? com.google.spanner.v1.PartitionOptions.getDefaultInstance()
+        : partitionOptions_;
   }
   /**
    *
@@ -578,14 +600,14 @@ public PartitionOptions getPartitionOptions() {
    *
    * .google.spanner.v1.PartitionOptions partition_options = 6;
    */
-  @Override
-  public PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
     return getPartitionOptions();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -595,7 +617,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, session_);
@@ -617,7 +639,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -635,8 +657,9 @@ public int getSerializedSize() {
     if (params_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getParams());
     }
-    for (java.util.Map.Entry entry : internalGetParamTypes().getMap().entrySet()) {
-      com.google.protobuf.MapEntry paramTypes__ =
+    for (java.util.Map.Entry entry :
+        internalGetParamTypes().getMap().entrySet()) {
+      com.google.protobuf.MapEntry paramTypes__ =
           ParamTypesDefaultEntryHolder.defaultEntry
               .newBuilderForType()
               .setKey(entry.getKey())
@@ -652,15 +675,16 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof PartitionQueryRequest)) {
+    if (!(obj instanceof com.google.spanner.v1.PartitionQueryRequest)) {
       return super.equals(obj);
     }
-    PartitionQueryRequest other = (PartitionQueryRequest) obj;
+    com.google.spanner.v1.PartitionQueryRequest other =
+        (com.google.spanner.v1.PartitionQueryRequest) obj;
 
     if (!getSession().equals(other.getSession())) return false;
     if (hasTransaction() != other.hasTransaction()) return false;
@@ -681,7 +705,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -713,70 +737,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static PartitionQueryRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartitionQueryRequest parseFrom(
+  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartitionQueryRequest parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartitionQueryRequest parseFrom(
+  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartitionQueryRequest parseFrom(byte[] data)
+  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartitionQueryRequest parseFrom(
+  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartitionQueryRequest parseFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static PartitionQueryRequest parseFrom(
+  public static com.google.spanner.v1.PartitionQueryRequest 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 PartitionQueryRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.PartitionQueryRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static PartitionQueryRequest parseDelimitedFrom(
+  public static com.google.spanner.v1.PartitionQueryRequest 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 PartitionQueryRequest parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static PartitionQueryRequest parseFrom(
+  public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -784,7 +809,7 @@ public static PartitionQueryRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -793,17 +818,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(PartitionQueryRequest prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.PartitionQueryRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -819,9 +844,10 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.PartitionQueryRequest)
-      PartitionQueryRequestOrBuilder {
+      com.google.spanner.v1.PartitionQueryRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_PartitionQueryRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_PartitionQueryRequest_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -844,10 +870,14 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       }
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto.internal_static_google_spanner_v1_PartitionQueryRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(PartitionQueryRequest.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_PartitionQueryRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.PartitionQueryRequest.class,
+              com.google.spanner.v1.PartitionQueryRequest.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.PartitionQueryRequest.newBuilder()
@@ -855,7 +885,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -864,7 +894,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -893,28 +923,30 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_PartitionQueryRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_PartitionQueryRequest_descriptor;
     }
 
-    @Override
-    public PartitionQueryRequest getDefaultInstanceForType() {
-      return PartitionQueryRequest.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.PartitionQueryRequest getDefaultInstanceForType() {
+      return com.google.spanner.v1.PartitionQueryRequest.getDefaultInstance();
     }
 
-    @Override
-    public PartitionQueryRequest build() {
-      PartitionQueryRequest result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.PartitionQueryRequest build() {
+      com.google.spanner.v1.PartitionQueryRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public PartitionQueryRequest buildPartial() {
-      PartitionQueryRequest result = new PartitionQueryRequest(this);
+    @java.lang.Override
+    public com.google.spanner.v1.PartitionQueryRequest buildPartial() {
+      com.google.spanner.v1.PartitionQueryRequest result =
+          new com.google.spanner.v1.PartitionQueryRequest(this);
       int from_bitField0_ = bitField0_;
       result.session_ = session_;
       if (transactionBuilder_ == null) {
@@ -939,50 +971,51 @@ public PartitionQueryRequest buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof PartitionQueryRequest) {
-        return mergeFrom((PartitionQueryRequest) other);
+      if (other instanceof com.google.spanner.v1.PartitionQueryRequest) {
+        return mergeFrom((com.google.spanner.v1.PartitionQueryRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(PartitionQueryRequest other) {
-      if (other == PartitionQueryRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.PartitionQueryRequest other) {
+      if (other == com.google.spanner.v1.PartitionQueryRequest.getDefaultInstance()) return this;
       if (!other.getSession().isEmpty()) {
         session_ = other.session_;
         onChanged();
@@ -1006,21 +1039,21 @@ public Builder mergeFrom(PartitionQueryRequest other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      PartitionQueryRequest parsedMessage = null;
+      com.google.spanner.v1.PartitionQueryRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (PartitionQueryRequest) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.PartitionQueryRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -1032,7 +1065,7 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private Object session_ = "";
+    private java.lang.Object session_ = "";
     /**
      *
      *
@@ -1046,15 +1079,15 @@ public Builder mergeFrom(
      *
      * @return The session.
      */
-    public String getSession() {
-      Object ref = session_;
-      if (!(ref instanceof String)) {
+    public java.lang.String getSession() {
+      java.lang.Object ref = session_;
+      if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         session_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -1071,10 +1104,10 @@ public String getSession() {
      * @return The bytes for session.
      */
     public com.google.protobuf.ByteString getSessionBytes() {
-      Object ref = session_;
+      java.lang.Object ref = session_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         session_ = b;
         return b;
       } else {
@@ -1095,7 +1128,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
      * @param value The session to set.
      * @return This builder for chaining.
      */
-    public Builder setSession(String value) {
+    public Builder setSession(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1148,9 +1181,11 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private TransactionSelector transaction_;
+    private com.google.spanner.v1.TransactionSelector transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            TransactionSelector, TransactionSelector.Builder, TransactionSelectorOrBuilder>
+            com.google.spanner.v1.TransactionSelector,
+            com.google.spanner.v1.TransactionSelector.Builder,
+            com.google.spanner.v1.TransactionSelectorOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -1179,9 +1214,11 @@ public boolean hasTransaction() {
      *
      * @return The transaction.
      */
-    public TransactionSelector getTransaction() {
+    public com.google.spanner.v1.TransactionSelector getTransaction() {
       if (transactionBuilder_ == null) {
-        return transaction_ == null ? TransactionSelector.getDefaultInstance() : transaction_;
+        return transaction_ == null
+            ? com.google.spanner.v1.TransactionSelector.getDefaultInstance()
+            : transaction_;
       } else {
         return transactionBuilder_.getMessage();
       }
@@ -1196,7 +1233,7 @@ public TransactionSelector getTransaction() {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public Builder setTransaction(TransactionSelector value) {
+    public Builder setTransaction(com.google.spanner.v1.TransactionSelector value) {
       if (transactionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1219,7 +1256,8 @@ public Builder setTransaction(TransactionSelector value) {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public Builder setTransaction(TransactionSelector.Builder builderForValue) {
+    public Builder setTransaction(
+        com.google.spanner.v1.TransactionSelector.Builder builderForValue) {
       if (transactionBuilder_ == null) {
         transaction_ = builderForValue.build();
         onChanged();
@@ -1239,11 +1277,13 @@ public Builder setTransaction(TransactionSelector.Builder builderForValue) {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public Builder mergeTransaction(TransactionSelector value) {
+    public Builder mergeTransaction(com.google.spanner.v1.TransactionSelector value) {
       if (transactionBuilder_ == null) {
         if (transaction_ != null) {
           transaction_ =
-              TransactionSelector.newBuilder(transaction_).mergeFrom(value).buildPartial();
+              com.google.spanner.v1.TransactionSelector.newBuilder(transaction_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           transaction_ = value;
         }
@@ -1285,7 +1325,7 @@ public Builder clearTransaction() {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public TransactionSelector.Builder getTransactionBuilder() {
+    public com.google.spanner.v1.TransactionSelector.Builder getTransactionBuilder() {
 
       onChanged();
       return getTransactionFieldBuilder().getBuilder();
@@ -1300,11 +1340,13 @@ public TransactionSelector.Builder getTransactionBuilder() {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public TransactionSelectorOrBuilder getTransactionOrBuilder() {
+    public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder() {
       if (transactionBuilder_ != null) {
         return transactionBuilder_.getMessageOrBuilder();
       } else {
-        return transaction_ == null ? TransactionSelector.getDefaultInstance() : transaction_;
+        return transaction_ == null
+            ? com.google.spanner.v1.TransactionSelector.getDefaultInstance()
+            : transaction_;
       }
     }
     /**
@@ -1318,19 +1360,23 @@ public TransactionSelectorOrBuilder getTransactionOrBuilder() {
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            TransactionSelector, TransactionSelector.Builder, TransactionSelectorOrBuilder>
+            com.google.spanner.v1.TransactionSelector,
+            com.google.spanner.v1.TransactionSelector.Builder,
+            com.google.spanner.v1.TransactionSelectorOrBuilder>
         getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                TransactionSelector, TransactionSelector.Builder, TransactionSelectorOrBuilder>(
+                com.google.spanner.v1.TransactionSelector,
+                com.google.spanner.v1.TransactionSelector.Builder,
+                com.google.spanner.v1.TransactionSelectorOrBuilder>(
                 getTransaction(), getParentForChildren(), isClean());
         transaction_ = null;
       }
       return transactionBuilder_;
     }
 
-    private Object sql_ = "";
+    private java.lang.Object sql_ = "";
     /**
      *
      *
@@ -1350,15 +1396,15 @@ public TransactionSelectorOrBuilder getTransactionOrBuilder() {
      *
      * @return The sql.
      */
-    public String getSql() {
-      Object ref = sql_;
-      if (!(ref instanceof String)) {
+    public java.lang.String getSql() {
+      java.lang.Object ref = sql_;
+      if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         sql_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -1381,10 +1427,10 @@ public String getSql() {
      * @return The bytes for sql.
      */
     public com.google.protobuf.ByteString getSqlBytes() {
-      Object ref = sql_;
+      java.lang.Object ref = sql_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         sql_ = b;
         return b;
       } else {
@@ -1411,7 +1457,7 @@ public com.google.protobuf.ByteString getSqlBytes() {
      * @param value The sql to set.
      * @return This builder for chaining.
      */
-    public Builder setSql(String value) {
+    public Builder setSql(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1717,9 +1763,10 @@ public com.google.protobuf.StructOrBuilder getParamsOrBuilder() {
       return paramsBuilder_;
     }
 
-    private com.google.protobuf.MapField paramTypes_;
+    private com.google.protobuf.MapField paramTypes_;
 
-    private com.google.protobuf.MapField internalGetParamTypes() {
+    private com.google.protobuf.MapField
+        internalGetParamTypes() {
       if (paramTypes_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             ParamTypesDefaultEntryHolder.defaultEntry);
@@ -1727,7 +1774,8 @@ private com.google.protobuf.MapField internalGetParamTypes() {
       return paramTypes_;
     }
 
-    private com.google.protobuf.MapField internalGetMutableParamTypes() {
+    private com.google.protobuf.MapField
+        internalGetMutableParamTypes() {
       onChanged();
       ;
       if (paramTypes_ == null) {
@@ -1758,17 +1806,17 @@ public int getParamTypesCount() {
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    @Override
-    public boolean containsParamTypes(String key) {
+    @java.lang.Override
+    public boolean containsParamTypes(java.lang.String key) {
       if (key == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       return internalGetParamTypes().getMap().containsKey(key);
     }
     /** Use {@link #getParamTypesMap()} instead. */
-    @Override
-    @Deprecated
-    public java.util.Map getParamTypes() {
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map getParamTypes() {
       return getParamTypesMap();
     }
     /**
@@ -1786,8 +1834,8 @@ public java.util.Map getParamTypes() {
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    @Override
-    public java.util.Map getParamTypesMap() {
+    @java.lang.Override
+    public java.util.Map getParamTypesMap() {
       return internalGetParamTypes().getMap();
     }
     /**
@@ -1805,12 +1853,14 @@ public java.util.Map getParamTypesMap() {
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    @Override
-    public Type getParamTypesOrDefault(String key, Type defaultValue) {
+    @java.lang.Override
+    public com.google.spanner.v1.Type getParamTypesOrDefault(
+        java.lang.String key, com.google.spanner.v1.Type defaultValue) {
       if (key == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
-      java.util.Map map = internalGetParamTypes().getMap();
+      java.util.Map map =
+          internalGetParamTypes().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
@@ -1828,14 +1878,15 @@ public Type getParamTypesOrDefault(String key, Type defaultValue) {
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    @Override
-    public Type getParamTypesOrThrow(String key) {
+    @java.lang.Override
+    public com.google.spanner.v1.Type getParamTypesOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
-      java.util.Map map = internalGetParamTypes().getMap();
+      java.util.Map map =
+          internalGetParamTypes().getMap();
       if (!map.containsKey(key)) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
       return map.get(key);
     }
@@ -1859,16 +1910,16 @@ public Builder clearParamTypes() {
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    public Builder removeParamTypes(String key) {
+    public Builder removeParamTypes(java.lang.String key) {
       if (key == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       internalGetMutableParamTypes().getMutableMap().remove(key);
       return this;
     }
     /** Use alternate mutation accessors instead. */
-    @Deprecated
-    public java.util.Map getMutableParamTypes() {
+    @java.lang.Deprecated
+    public java.util.Map getMutableParamTypes() {
       return internalGetMutableParamTypes().getMutableMap();
     }
     /**
@@ -1886,12 +1937,12 @@ public java.util.Map getMutableParamTypes() {
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    public Builder putParamTypes(String key, Type value) {
+    public Builder putParamTypes(java.lang.String key, com.google.spanner.v1.Type value) {
       if (key == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       if (value == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       internalGetMutableParamTypes().getMutableMap().put(key, value);
       return this;
@@ -1911,14 +1962,17 @@ public Builder putParamTypes(String key, Type value) {
      *
      * map<string, .google.spanner.v1.Type> param_types = 5;
      */
-    public Builder putAllParamTypes(java.util.Map values) {
+    public Builder putAllParamTypes(
+        java.util.Map values) {
       internalGetMutableParamTypes().getMutableMap().putAll(values);
       return this;
     }
 
-    private PartitionOptions partitionOptions_;
+    private com.google.spanner.v1.PartitionOptions partitionOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            PartitionOptions, PartitionOptions.Builder, PartitionOptionsOrBuilder>
+            com.google.spanner.v1.PartitionOptions,
+            com.google.spanner.v1.PartitionOptions.Builder,
+            com.google.spanner.v1.PartitionOptionsOrBuilder>
         partitionOptionsBuilder_;
     /**
      *
@@ -1945,10 +1999,10 @@ public boolean hasPartitionOptions() {
      *
      * @return The partitionOptions.
      */
-    public PartitionOptions getPartitionOptions() {
+    public com.google.spanner.v1.PartitionOptions getPartitionOptions() {
       if (partitionOptionsBuilder_ == null) {
         return partitionOptions_ == null
-            ? PartitionOptions.getDefaultInstance()
+            ? com.google.spanner.v1.PartitionOptions.getDefaultInstance()
             : partitionOptions_;
       } else {
         return partitionOptionsBuilder_.getMessage();
@@ -1963,7 +2017,7 @@ public PartitionOptions getPartitionOptions() {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 6;
      */
-    public Builder setPartitionOptions(PartitionOptions value) {
+    public Builder setPartitionOptions(com.google.spanner.v1.PartitionOptions value) {
       if (partitionOptionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1985,7 +2039,8 @@ public Builder setPartitionOptions(PartitionOptions value) {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 6;
      */
-    public Builder setPartitionOptions(PartitionOptions.Builder builderForValue) {
+    public Builder setPartitionOptions(
+        com.google.spanner.v1.PartitionOptions.Builder builderForValue) {
       if (partitionOptionsBuilder_ == null) {
         partitionOptions_ = builderForValue.build();
         onChanged();
@@ -2004,11 +2059,13 @@ public Builder setPartitionOptions(PartitionOptions.Builder builderForValue) {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 6;
      */
-    public Builder mergePartitionOptions(PartitionOptions value) {
+    public Builder mergePartitionOptions(com.google.spanner.v1.PartitionOptions value) {
       if (partitionOptionsBuilder_ == null) {
         if (partitionOptions_ != null) {
           partitionOptions_ =
-              PartitionOptions.newBuilder(partitionOptions_).mergeFrom(value).buildPartial();
+              com.google.spanner.v1.PartitionOptions.newBuilder(partitionOptions_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           partitionOptions_ = value;
         }
@@ -2048,7 +2105,7 @@ public Builder clearPartitionOptions() {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 6;
      */
-    public PartitionOptions.Builder getPartitionOptionsBuilder() {
+    public com.google.spanner.v1.PartitionOptions.Builder getPartitionOptionsBuilder() {
 
       onChanged();
       return getPartitionOptionsFieldBuilder().getBuilder();
@@ -2062,12 +2119,12 @@ public PartitionOptions.Builder getPartitionOptionsBuilder() {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 6;
      */
-    public PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
+    public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
       if (partitionOptionsBuilder_ != null) {
         return partitionOptionsBuilder_.getMessageOrBuilder();
       } else {
         return partitionOptions_ == null
-            ? PartitionOptions.getDefaultInstance()
+            ? com.google.spanner.v1.PartitionOptions.getDefaultInstance()
             : partitionOptions_;
       }
     }
@@ -2081,24 +2138,28 @@ public PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
      * .google.spanner.v1.PartitionOptions partition_options = 6;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            PartitionOptions, PartitionOptions.Builder, PartitionOptionsOrBuilder>
+            com.google.spanner.v1.PartitionOptions,
+            com.google.spanner.v1.PartitionOptions.Builder,
+            com.google.spanner.v1.PartitionOptionsOrBuilder>
         getPartitionOptionsFieldBuilder() {
       if (partitionOptionsBuilder_ == null) {
         partitionOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                PartitionOptions, PartitionOptions.Builder, PartitionOptionsOrBuilder>(
+                com.google.spanner.v1.PartitionOptions,
+                com.google.spanner.v1.PartitionOptions.Builder,
+                com.google.spanner.v1.PartitionOptionsOrBuilder>(
                 getPartitionOptions(), getParentForChildren(), isClean());
         partitionOptions_ = null;
       }
       return partitionOptionsBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2108,19 +2169,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.PartitionQueryRequest)
-  private static final PartitionQueryRequest DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.PartitionQueryRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new PartitionQueryRequest();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.PartitionQueryRequest();
   }
 
-  public static PartitionQueryRequest getDefaultInstance() {
+  public static com.google.spanner.v1.PartitionQueryRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public PartitionQueryRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2133,13 +2194,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public PartitionQueryRequest getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.PartitionQueryRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequestOrBuilder.java
index dcae90106c..e771b3d289 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface PartitionQueryRequestOrBuilder
    *
    * @return The session.
    */
-  String getSession();
+  java.lang.String getSession();
   /**
    *
    *
@@ -77,7 +77,7 @@ public interface PartitionQueryRequestOrBuilder
    *
    * @return The transaction.
    */
-  TransactionSelector getTransaction();
+  com.google.spanner.v1.TransactionSelector getTransaction();
   /**
    *
    *
@@ -88,7 +88,7 @@ public interface PartitionQueryRequestOrBuilder
    *
    * .google.spanner.v1.TransactionSelector transaction = 2;
    */
-  TransactionSelectorOrBuilder getTransactionOrBuilder();
+  com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder();
 
   /**
    *
@@ -109,7 +109,7 @@ public interface PartitionQueryRequestOrBuilder
    *
    * @return The sql.
    */
-  String getSql();
+  java.lang.String getSql();
   /**
    *
    *
@@ -218,10 +218,10 @@ public interface PartitionQueryRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  boolean containsParamTypes(String key);
+  boolean containsParamTypes(java.lang.String key);
   /** Use {@link #getParamTypesMap()} instead. */
-  @Deprecated
-  java.util.Map getParamTypes();
+  @java.lang.Deprecated
+  java.util.Map getParamTypes();
   /**
    *
    *
@@ -237,7 +237,7 @@ public interface PartitionQueryRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  java.util.Map getParamTypesMap();
+  java.util.Map getParamTypesMap();
   /**
    *
    *
@@ -253,7 +253,8 @@ public interface PartitionQueryRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  Type getParamTypesOrDefault(String key, Type defaultValue);
+  com.google.spanner.v1.Type getParamTypesOrDefault(
+      java.lang.String key, com.google.spanner.v1.Type defaultValue);
   /**
    *
    *
@@ -269,7 +270,7 @@ public interface PartitionQueryRequestOrBuilder
    *
    * map<string, .google.spanner.v1.Type> param_types = 5;
    */
-  Type getParamTypesOrThrow(String key);
+  com.google.spanner.v1.Type getParamTypesOrThrow(java.lang.String key);
 
   /**
    *
@@ -294,7 +295,7 @@ public interface PartitionQueryRequestOrBuilder
    *
    * @return The partitionOptions.
    */
-  PartitionOptions getPartitionOptions();
+  com.google.spanner.v1.PartitionOptions getPartitionOptions();
   /**
    *
    *
@@ -304,5 +305,5 @@ public interface PartitionQueryRequestOrBuilder
    *
    * .google.spanner.v1.PartitionOptions partition_options = 6;
    */
-  PartitionOptionsOrBuilder getPartitionOptionsOrBuilder();
+  com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java
index 63f3e7cbd2..0639cae76b 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java
@@ -44,13 +44,13 @@ private PartitionReadRequest() {
     columns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PartitionReadRequest();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -61,7 +61,7 @@ private PartitionReadRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -76,18 +76,20 @@ private PartitionReadRequest(
             break;
           case 10:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               session_ = s;
               break;
             }
           case 18:
             {
-              TransactionSelector.Builder subBuilder = null;
+              com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
               if (transaction_ != null) {
                 subBuilder = transaction_.toBuilder();
               }
-              transaction_ = input.readMessage(TransactionSelector.parser(), extensionRegistry);
+              transaction_ =
+                  input.readMessage(
+                      com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(transaction_);
                 transaction_ = subBuilder.buildPartial();
@@ -97,21 +99,21 @@ private PartitionReadRequest(
             }
           case 26:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               table_ = s;
               break;
             }
           case 34:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               index_ = s;
               break;
             }
           case 42:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 columns_ = new com.google.protobuf.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000001;
@@ -121,11 +123,11 @@ private PartitionReadRequest(
             }
           case 50:
             {
-              KeySet.Builder subBuilder = null;
+              com.google.spanner.v1.KeySet.Builder subBuilder = null;
               if (keySet_ != null) {
                 subBuilder = keySet_.toBuilder();
               }
-              keySet_ = input.readMessage(KeySet.parser(), extensionRegistry);
+              keySet_ = input.readMessage(com.google.spanner.v1.KeySet.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(keySet_);
                 keySet_ = subBuilder.buildPartial();
@@ -135,11 +137,13 @@ private PartitionReadRequest(
             }
           case 74:
             {
-              PartitionOptions.Builder subBuilder = null;
+              com.google.spanner.v1.PartitionOptions.Builder subBuilder = null;
               if (partitionOptions_ != null) {
                 subBuilder = partitionOptions_.toBuilder();
               }
-              partitionOptions_ = input.readMessage(PartitionOptions.parser(), extensionRegistry);
+              partitionOptions_ =
+                  input.readMessage(
+                      com.google.spanner.v1.PartitionOptions.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(partitionOptions_);
                 partitionOptions_ = subBuilder.buildPartial();
@@ -170,17 +174,22 @@ private PartitionReadRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(PartitionReadRequest.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_PartitionReadRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.PartitionReadRequest.class,
+            com.google.spanner.v1.PartitionReadRequest.Builder.class);
   }
 
   public static final int SESSION_FIELD_NUMBER = 1;
-  private volatile Object session_;
+  private volatile java.lang.Object session_;
   /**
    *
    *
@@ -194,14 +203,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return The session.
    */
-  @Override
-  public String getSession() {
-    Object ref = session_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  public java.lang.String getSession() {
+    java.lang.Object ref = session_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       session_ = s;
       return s;
     }
@@ -219,11 +228,12 @@ public String getSession() {
    *
    * @return The bytes for session.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getSessionBytes() {
-    Object ref = session_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    java.lang.Object ref = session_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       session_ = b;
       return b;
     } else {
@@ -232,7 +242,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 2;
-  private TransactionSelector transaction_;
+  private com.google.spanner.v1.TransactionSelector transaction_;
   /**
    *
    *
@@ -245,7 +255,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
    *
    * @return Whether the transaction field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasTransaction() {
     return transaction_ != null;
   }
@@ -261,9 +271,11 @@ public boolean hasTransaction() {
    *
    * @return The transaction.
    */
-  @Override
-  public TransactionSelector getTransaction() {
-    return transaction_ == null ? TransactionSelector.getDefaultInstance() : transaction_;
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionSelector getTransaction() {
+    return transaction_ == null
+        ? com.google.spanner.v1.TransactionSelector.getDefaultInstance()
+        : transaction_;
   }
   /**
    *
@@ -275,13 +287,13 @@ public TransactionSelector getTransaction() {
    *
    * .google.spanner.v1.TransactionSelector transaction = 2;
    */
-  @Override
-  public TransactionSelectorOrBuilder getTransactionOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder() {
     return getTransaction();
   }
 
   public static final int TABLE_FIELD_NUMBER = 3;
-  private volatile Object table_;
+  private volatile java.lang.Object table_;
   /**
    *
    *
@@ -293,14 +305,14 @@ public TransactionSelectorOrBuilder getTransactionOrBuilder() {
    *
    * @return The table.
    */
-  @Override
-  public String getTable() {
-    Object ref = table_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  public java.lang.String getTable() {
+    java.lang.Object ref = table_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       table_ = s;
       return s;
     }
@@ -316,11 +328,12 @@ public String getTable() {
    *
    * @return The bytes for table.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getTableBytes() {
-    Object ref = table_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    java.lang.Object ref = table_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       table_ = b;
       return b;
     } else {
@@ -329,7 +342,7 @@ public com.google.protobuf.ByteString getTableBytes() {
   }
 
   public static final int INDEX_FIELD_NUMBER = 4;
-  private volatile Object index_;
+  private volatile java.lang.Object index_;
   /**
    *
    *
@@ -343,14 +356,14 @@ public com.google.protobuf.ByteString getTableBytes() {
    *
    * @return The index.
    */
-  @Override
-  public String getIndex() {
-    Object ref = index_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  public java.lang.String getIndex() {
+    java.lang.Object ref = index_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       index_ = s;
       return s;
     }
@@ -368,11 +381,12 @@ public String getIndex() {
    *
    * @return The bytes for index.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getIndexBytes() {
-    Object ref = index_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    java.lang.Object ref = index_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       index_ = b;
       return b;
     } else {
@@ -425,7 +439,7 @@ public int getColumnsCount() {
    * @param index The index of the element to return.
    * @return The columns at the given index.
    */
-  public String getColumns(int index) {
+  public java.lang.String getColumns(int index) {
     return columns_.get(index);
   }
   /**
@@ -446,7 +460,7 @@ public com.google.protobuf.ByteString getColumnsBytes(int index) {
   }
 
   public static final int KEY_SET_FIELD_NUMBER = 6;
-  private KeySet keySet_;
+  private com.google.spanner.v1.KeySet keySet_;
   /**
    *
    *
@@ -463,7 +477,7 @@ public com.google.protobuf.ByteString getColumnsBytes(int index) {
    *
    * @return Whether the keySet field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasKeySet() {
     return keySet_ != null;
   }
@@ -483,9 +497,9 @@ public boolean hasKeySet() {
    *
    * @return The keySet.
    */
-  @Override
-  public KeySet getKeySet() {
-    return keySet_ == null ? KeySet.getDefaultInstance() : keySet_;
+  @java.lang.Override
+  public com.google.spanner.v1.KeySet getKeySet() {
+    return keySet_ == null ? com.google.spanner.v1.KeySet.getDefaultInstance() : keySet_;
   }
   /**
    *
@@ -501,13 +515,13 @@ public KeySet getKeySet() {
    *
    * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
    */
-  @Override
-  public KeySetOrBuilder getKeySetOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
     return getKeySet();
   }
 
   public static final int PARTITION_OPTIONS_FIELD_NUMBER = 9;
-  private PartitionOptions partitionOptions_;
+  private com.google.spanner.v1.PartitionOptions partitionOptions_;
   /**
    *
    *
@@ -519,7 +533,7 @@ public KeySetOrBuilder getKeySetOrBuilder() {
    *
    * @return Whether the partitionOptions field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasPartitionOptions() {
     return partitionOptions_ != null;
   }
@@ -534,9 +548,11 @@ public boolean hasPartitionOptions() {
    *
    * @return The partitionOptions.
    */
-  @Override
-  public PartitionOptions getPartitionOptions() {
-    return partitionOptions_ == null ? PartitionOptions.getDefaultInstance() : partitionOptions_;
+  @java.lang.Override
+  public com.google.spanner.v1.PartitionOptions getPartitionOptions() {
+    return partitionOptions_ == null
+        ? com.google.spanner.v1.PartitionOptions.getDefaultInstance()
+        : partitionOptions_;
   }
   /**
    *
@@ -547,14 +563,14 @@ public PartitionOptions getPartitionOptions() {
    *
    * .google.spanner.v1.PartitionOptions partition_options = 9;
    */
-  @Override
-  public PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
     return getPartitionOptions();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -564,7 +580,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, session_);
@@ -590,7 +606,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -627,15 +643,16 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof PartitionReadRequest)) {
+    if (!(obj instanceof com.google.spanner.v1.PartitionReadRequest)) {
       return super.equals(obj);
     }
-    PartitionReadRequest other = (PartitionReadRequest) obj;
+    com.google.spanner.v1.PartitionReadRequest other =
+        (com.google.spanner.v1.PartitionReadRequest) obj;
 
     if (!getSession().equals(other.getSession())) return false;
     if (hasTransaction() != other.hasTransaction()) return false;
@@ -657,7 +674,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -691,70 +708,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static PartitionReadRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.PartitionReadRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartitionReadRequest parseFrom(
+  public static com.google.spanner.v1.PartitionReadRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartitionReadRequest parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.PartitionReadRequest parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartitionReadRequest parseFrom(
+  public static com.google.spanner.v1.PartitionReadRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartitionReadRequest parseFrom(byte[] data)
+  public static com.google.spanner.v1.PartitionReadRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartitionReadRequest parseFrom(
+  public static com.google.spanner.v1.PartitionReadRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartitionReadRequest parseFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.PartitionReadRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static PartitionReadRequest parseFrom(
+  public static com.google.spanner.v1.PartitionReadRequest 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 PartitionReadRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.PartitionReadRequest parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static PartitionReadRequest parseDelimitedFrom(
+  public static com.google.spanner.v1.PartitionReadRequest 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 PartitionReadRequest parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.PartitionReadRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static PartitionReadRequest parseFrom(
+  public static com.google.spanner.v1.PartitionReadRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -762,7 +780,7 @@ public static PartitionReadRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -771,17 +789,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(PartitionReadRequest prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.PartitionReadRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -797,15 +815,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.PartitionReadRequest)
-      PartitionReadRequestOrBuilder {
+      com.google.spanner.v1.PartitionReadRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(PartitionReadRequest.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_PartitionReadRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.PartitionReadRequest.class,
+              com.google.spanner.v1.PartitionReadRequest.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.PartitionReadRequest.newBuilder()
@@ -813,7 +836,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -822,7 +845,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -854,28 +877,30 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
     }
 
-    @Override
-    public PartitionReadRequest getDefaultInstanceForType() {
-      return PartitionReadRequest.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.PartitionReadRequest getDefaultInstanceForType() {
+      return com.google.spanner.v1.PartitionReadRequest.getDefaultInstance();
     }
 
-    @Override
-    public PartitionReadRequest build() {
-      PartitionReadRequest result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.PartitionReadRequest build() {
+      com.google.spanner.v1.PartitionReadRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public PartitionReadRequest buildPartial() {
-      PartitionReadRequest result = new PartitionReadRequest(this);
+    @java.lang.Override
+    public com.google.spanner.v1.PartitionReadRequest buildPartial() {
+      com.google.spanner.v1.PartitionReadRequest result =
+          new com.google.spanner.v1.PartitionReadRequest(this);
       int from_bitField0_ = bitField0_;
       result.session_ = session_;
       if (transactionBuilder_ == null) {
@@ -904,50 +929,51 @@ public PartitionReadRequest buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof PartitionReadRequest) {
-        return mergeFrom((PartitionReadRequest) other);
+      if (other instanceof com.google.spanner.v1.PartitionReadRequest) {
+        return mergeFrom((com.google.spanner.v1.PartitionReadRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(PartitionReadRequest other) {
-      if (other == PartitionReadRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.PartitionReadRequest other) {
+      if (other == com.google.spanner.v1.PartitionReadRequest.getDefaultInstance()) return this;
       if (!other.getSession().isEmpty()) {
         session_ = other.session_;
         onChanged();
@@ -984,21 +1010,21 @@ public Builder mergeFrom(PartitionReadRequest other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      PartitionReadRequest parsedMessage = null;
+      com.google.spanner.v1.PartitionReadRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (PartitionReadRequest) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.PartitionReadRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -1010,7 +1036,7 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private Object session_ = "";
+    private java.lang.Object session_ = "";
     /**
      *
      *
@@ -1024,15 +1050,15 @@ public Builder mergeFrom(
      *
      * @return The session.
      */
-    public String getSession() {
-      Object ref = session_;
-      if (!(ref instanceof String)) {
+    public java.lang.String getSession() {
+      java.lang.Object ref = session_;
+      if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         session_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -1049,10 +1075,10 @@ public String getSession() {
      * @return The bytes for session.
      */
     public com.google.protobuf.ByteString getSessionBytes() {
-      Object ref = session_;
+      java.lang.Object ref = session_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         session_ = b;
         return b;
       } else {
@@ -1073,7 +1099,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
      * @param value The session to set.
      * @return This builder for chaining.
      */
-    public Builder setSession(String value) {
+    public Builder setSession(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1126,9 +1152,11 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private TransactionSelector transaction_;
+    private com.google.spanner.v1.TransactionSelector transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            TransactionSelector, TransactionSelector.Builder, TransactionSelectorOrBuilder>
+            com.google.spanner.v1.TransactionSelector,
+            com.google.spanner.v1.TransactionSelector.Builder,
+            com.google.spanner.v1.TransactionSelectorOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -1157,9 +1185,11 @@ public boolean hasTransaction() {
      *
      * @return The transaction.
      */
-    public TransactionSelector getTransaction() {
+    public com.google.spanner.v1.TransactionSelector getTransaction() {
       if (transactionBuilder_ == null) {
-        return transaction_ == null ? TransactionSelector.getDefaultInstance() : transaction_;
+        return transaction_ == null
+            ? com.google.spanner.v1.TransactionSelector.getDefaultInstance()
+            : transaction_;
       } else {
         return transactionBuilder_.getMessage();
       }
@@ -1174,7 +1204,7 @@ public TransactionSelector getTransaction() {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public Builder setTransaction(TransactionSelector value) {
+    public Builder setTransaction(com.google.spanner.v1.TransactionSelector value) {
       if (transactionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1197,7 +1227,8 @@ public Builder setTransaction(TransactionSelector value) {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public Builder setTransaction(TransactionSelector.Builder builderForValue) {
+    public Builder setTransaction(
+        com.google.spanner.v1.TransactionSelector.Builder builderForValue) {
       if (transactionBuilder_ == null) {
         transaction_ = builderForValue.build();
         onChanged();
@@ -1217,11 +1248,13 @@ public Builder setTransaction(TransactionSelector.Builder builderForValue) {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public Builder mergeTransaction(TransactionSelector value) {
+    public Builder mergeTransaction(com.google.spanner.v1.TransactionSelector value) {
       if (transactionBuilder_ == null) {
         if (transaction_ != null) {
           transaction_ =
-              TransactionSelector.newBuilder(transaction_).mergeFrom(value).buildPartial();
+              com.google.spanner.v1.TransactionSelector.newBuilder(transaction_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           transaction_ = value;
         }
@@ -1263,7 +1296,7 @@ public Builder clearTransaction() {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public TransactionSelector.Builder getTransactionBuilder() {
+    public com.google.spanner.v1.TransactionSelector.Builder getTransactionBuilder() {
 
       onChanged();
       return getTransactionFieldBuilder().getBuilder();
@@ -1278,11 +1311,13 @@ public TransactionSelector.Builder getTransactionBuilder() {
      *
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
-    public TransactionSelectorOrBuilder getTransactionOrBuilder() {
+    public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder() {
       if (transactionBuilder_ != null) {
         return transactionBuilder_.getMessageOrBuilder();
       } else {
-        return transaction_ == null ? TransactionSelector.getDefaultInstance() : transaction_;
+        return transaction_ == null
+            ? com.google.spanner.v1.TransactionSelector.getDefaultInstance()
+            : transaction_;
       }
     }
     /**
@@ -1296,19 +1331,23 @@ public TransactionSelectorOrBuilder getTransactionOrBuilder() {
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            TransactionSelector, TransactionSelector.Builder, TransactionSelectorOrBuilder>
+            com.google.spanner.v1.TransactionSelector,
+            com.google.spanner.v1.TransactionSelector.Builder,
+            com.google.spanner.v1.TransactionSelectorOrBuilder>
         getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                TransactionSelector, TransactionSelector.Builder, TransactionSelectorOrBuilder>(
+                com.google.spanner.v1.TransactionSelector,
+                com.google.spanner.v1.TransactionSelector.Builder,
+                com.google.spanner.v1.TransactionSelectorOrBuilder>(
                 getTransaction(), getParentForChildren(), isClean());
         transaction_ = null;
       }
       return transactionBuilder_;
     }
 
-    private Object table_ = "";
+    private java.lang.Object table_ = "";
     /**
      *
      *
@@ -1320,15 +1359,15 @@ public TransactionSelectorOrBuilder getTransactionOrBuilder() {
      *
      * @return The table.
      */
-    public String getTable() {
-      Object ref = table_;
-      if (!(ref instanceof String)) {
+    public java.lang.String getTable() {
+      java.lang.Object ref = table_;
+      if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         table_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -1343,10 +1382,10 @@ public String getTable() {
      * @return The bytes for table.
      */
     public com.google.protobuf.ByteString getTableBytes() {
-      Object ref = table_;
+      java.lang.Object ref = table_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         table_ = b;
         return b;
       } else {
@@ -1365,7 +1404,7 @@ public com.google.protobuf.ByteString getTableBytes() {
      * @param value The table to set.
      * @return This builder for chaining.
      */
-    public Builder setTable(String value) {
+    public Builder setTable(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1414,7 +1453,7 @@ public Builder setTableBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private Object index_ = "";
+    private java.lang.Object index_ = "";
     /**
      *
      *
@@ -1428,15 +1467,15 @@ public Builder setTableBytes(com.google.protobuf.ByteString value) {
      *
      * @return The index.
      */
-    public String getIndex() {
-      Object ref = index_;
-      if (!(ref instanceof String)) {
+    public java.lang.String getIndex() {
+      java.lang.Object ref = index_;
+      if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         index_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -1453,10 +1492,10 @@ public String getIndex() {
      * @return The bytes for index.
      */
     public com.google.protobuf.ByteString getIndexBytes() {
-      Object ref = index_;
+      java.lang.Object ref = index_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         index_ = b;
         return b;
       } else {
@@ -1477,7 +1516,7 @@ public com.google.protobuf.ByteString getIndexBytes() {
      * @param value The index to set.
      * @return This builder for chaining.
      */
-    public Builder setIndex(String value) {
+    public Builder setIndex(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1582,7 +1621,7 @@ public int getColumnsCount() {
      * @param index The index of the element to return.
      * @return The columns at the given index.
      */
-    public String getColumns(int index) {
+    public java.lang.String getColumns(int index) {
       return columns_.get(index);
     }
     /**
@@ -1615,7 +1654,7 @@ public com.google.protobuf.ByteString getColumnsBytes(int index) {
      * @param value The columns to set.
      * @return This builder for chaining.
      */
-    public Builder setColumns(int index, String value) {
+    public Builder setColumns(int index, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1637,7 +1676,7 @@ public Builder setColumns(int index, String value) {
      * @param value The columns to add.
      * @return This builder for chaining.
      */
-    public Builder addColumns(String value) {
+    public Builder addColumns(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1659,7 +1698,7 @@ public Builder addColumns(String value) {
      * @param values The columns to add.
      * @return This builder for chaining.
      */
-    public Builder addAllColumns(Iterable values) {
+    public Builder addAllColumns(java.lang.Iterable values) {
       ensureColumnsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, columns_);
       onChanged();
@@ -1707,8 +1746,11 @@ public Builder addColumnsBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private KeySet keySet_;
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.spanner.v1.KeySet keySet_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.KeySet,
+            com.google.spanner.v1.KeySet.Builder,
+            com.google.spanner.v1.KeySetOrBuilder>
         keySetBuilder_;
     /**
      *
@@ -1745,9 +1787,9 @@ public boolean hasKeySet() {
      *
      * @return The keySet.
      */
-    public KeySet getKeySet() {
+    public com.google.spanner.v1.KeySet getKeySet() {
       if (keySetBuilder_ == null) {
-        return keySet_ == null ? KeySet.getDefaultInstance() : keySet_;
+        return keySet_ == null ? com.google.spanner.v1.KeySet.getDefaultInstance() : keySet_;
       } else {
         return keySetBuilder_.getMessage();
       }
@@ -1766,7 +1808,7 @@ public KeySet getKeySet() {
      *
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder setKeySet(KeySet value) {
+    public Builder setKeySet(com.google.spanner.v1.KeySet value) {
       if (keySetBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1793,7 +1835,7 @@ public Builder setKeySet(KeySet value) {
      *
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder setKeySet(KeySet.Builder builderForValue) {
+    public Builder setKeySet(com.google.spanner.v1.KeySet.Builder builderForValue) {
       if (keySetBuilder_ == null) {
         keySet_ = builderForValue.build();
         onChanged();
@@ -1817,10 +1859,11 @@ public Builder setKeySet(KeySet.Builder builderForValue) {
      *
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder mergeKeySet(KeySet value) {
+    public Builder mergeKeySet(com.google.spanner.v1.KeySet value) {
       if (keySetBuilder_ == null) {
         if (keySet_ != null) {
-          keySet_ = KeySet.newBuilder(keySet_).mergeFrom(value).buildPartial();
+          keySet_ =
+              com.google.spanner.v1.KeySet.newBuilder(keySet_).mergeFrom(value).buildPartial();
         } else {
           keySet_ = value;
         }
@@ -1870,7 +1913,7 @@ public Builder clearKeySet() {
      *
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
-    public KeySet.Builder getKeySetBuilder() {
+    public com.google.spanner.v1.KeySet.Builder getKeySetBuilder() {
 
       onChanged();
       return getKeySetFieldBuilder().getBuilder();
@@ -1889,11 +1932,11 @@ public KeySet.Builder getKeySetBuilder() {
      *
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
-    public KeySetOrBuilder getKeySetOrBuilder() {
+    public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
       if (keySetBuilder_ != null) {
         return keySetBuilder_.getMessageOrBuilder();
       } else {
-        return keySet_ == null ? KeySet.getDefaultInstance() : keySet_;
+        return keySet_ == null ? com.google.spanner.v1.KeySet.getDefaultInstance() : keySet_;
       }
     }
     /**
@@ -1910,20 +1953,28 @@ public KeySetOrBuilder getKeySetOrBuilder() {
      *
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.KeySet,
+            com.google.spanner.v1.KeySet.Builder,
+            com.google.spanner.v1.KeySetOrBuilder>
         getKeySetFieldBuilder() {
       if (keySetBuilder_ == null) {
         keySetBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3(
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.spanner.v1.KeySet,
+                com.google.spanner.v1.KeySet.Builder,
+                com.google.spanner.v1.KeySetOrBuilder>(
                 getKeySet(), getParentForChildren(), isClean());
         keySet_ = null;
       }
       return keySetBuilder_;
     }
 
-    private PartitionOptions partitionOptions_;
+    private com.google.spanner.v1.PartitionOptions partitionOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            PartitionOptions, PartitionOptions.Builder, PartitionOptionsOrBuilder>
+            com.google.spanner.v1.PartitionOptions,
+            com.google.spanner.v1.PartitionOptions.Builder,
+            com.google.spanner.v1.PartitionOptionsOrBuilder>
         partitionOptionsBuilder_;
     /**
      *
@@ -1950,10 +2001,10 @@ public boolean hasPartitionOptions() {
      *
      * @return The partitionOptions.
      */
-    public PartitionOptions getPartitionOptions() {
+    public com.google.spanner.v1.PartitionOptions getPartitionOptions() {
       if (partitionOptionsBuilder_ == null) {
         return partitionOptions_ == null
-            ? PartitionOptions.getDefaultInstance()
+            ? com.google.spanner.v1.PartitionOptions.getDefaultInstance()
             : partitionOptions_;
       } else {
         return partitionOptionsBuilder_.getMessage();
@@ -1968,7 +2019,7 @@ public PartitionOptions getPartitionOptions() {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 9;
      */
-    public Builder setPartitionOptions(PartitionOptions value) {
+    public Builder setPartitionOptions(com.google.spanner.v1.PartitionOptions value) {
       if (partitionOptionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1990,7 +2041,8 @@ public Builder setPartitionOptions(PartitionOptions value) {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 9;
      */
-    public Builder setPartitionOptions(PartitionOptions.Builder builderForValue) {
+    public Builder setPartitionOptions(
+        com.google.spanner.v1.PartitionOptions.Builder builderForValue) {
       if (partitionOptionsBuilder_ == null) {
         partitionOptions_ = builderForValue.build();
         onChanged();
@@ -2009,11 +2061,13 @@ public Builder setPartitionOptions(PartitionOptions.Builder builderForValue) {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 9;
      */
-    public Builder mergePartitionOptions(PartitionOptions value) {
+    public Builder mergePartitionOptions(com.google.spanner.v1.PartitionOptions value) {
       if (partitionOptionsBuilder_ == null) {
         if (partitionOptions_ != null) {
           partitionOptions_ =
-              PartitionOptions.newBuilder(partitionOptions_).mergeFrom(value).buildPartial();
+              com.google.spanner.v1.PartitionOptions.newBuilder(partitionOptions_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           partitionOptions_ = value;
         }
@@ -2053,7 +2107,7 @@ public Builder clearPartitionOptions() {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 9;
      */
-    public PartitionOptions.Builder getPartitionOptionsBuilder() {
+    public com.google.spanner.v1.PartitionOptions.Builder getPartitionOptionsBuilder() {
 
       onChanged();
       return getPartitionOptionsFieldBuilder().getBuilder();
@@ -2067,12 +2121,12 @@ public PartitionOptions.Builder getPartitionOptionsBuilder() {
      *
      * .google.spanner.v1.PartitionOptions partition_options = 9;
      */
-    public PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
+    public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
       if (partitionOptionsBuilder_ != null) {
         return partitionOptionsBuilder_.getMessageOrBuilder();
       } else {
         return partitionOptions_ == null
-            ? PartitionOptions.getDefaultInstance()
+            ? com.google.spanner.v1.PartitionOptions.getDefaultInstance()
             : partitionOptions_;
       }
     }
@@ -2086,24 +2140,28 @@ public PartitionOptionsOrBuilder getPartitionOptionsOrBuilder() {
      * .google.spanner.v1.PartitionOptions partition_options = 9;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            PartitionOptions, PartitionOptions.Builder, PartitionOptionsOrBuilder>
+            com.google.spanner.v1.PartitionOptions,
+            com.google.spanner.v1.PartitionOptions.Builder,
+            com.google.spanner.v1.PartitionOptionsOrBuilder>
         getPartitionOptionsFieldBuilder() {
       if (partitionOptionsBuilder_ == null) {
         partitionOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                PartitionOptions, PartitionOptions.Builder, PartitionOptionsOrBuilder>(
+                com.google.spanner.v1.PartitionOptions,
+                com.google.spanner.v1.PartitionOptions.Builder,
+                com.google.spanner.v1.PartitionOptionsOrBuilder>(
                 getPartitionOptions(), getParentForChildren(), isClean());
         partitionOptions_ = null;
       }
       return partitionOptionsBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2113,19 +2171,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.PartitionReadRequest)
-  private static final PartitionReadRequest DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.PartitionReadRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new PartitionReadRequest();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.PartitionReadRequest();
   }
 
-  public static PartitionReadRequest getDefaultInstance() {
+  public static com.google.spanner.v1.PartitionReadRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public PartitionReadRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2138,13 +2196,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public PartitionReadRequest getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.PartitionReadRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequestOrBuilder.java
index c5c4a1f6fb..3b178f7183 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return The session.
    */
-  String getSession();
+  java.lang.String getSession();
   /**
    *
    *
@@ -77,7 +77,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return The transaction.
    */
-  TransactionSelector getTransaction();
+  com.google.spanner.v1.TransactionSelector getTransaction();
   /**
    *
    *
@@ -88,7 +88,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * .google.spanner.v1.TransactionSelector transaction = 2;
    */
-  TransactionSelectorOrBuilder getTransactionOrBuilder();
+  com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder();
 
   /**
    *
@@ -101,7 +101,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return The table.
    */
-  String getTable();
+  java.lang.String getTable();
   /**
    *
    *
@@ -128,7 +128,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return The index.
    */
-  String getIndex();
+  java.lang.String getIndex();
   /**
    *
    *
@@ -156,7 +156,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return A list containing the columns.
    */
-  java.util.List getColumnsList();
+  java.util.List getColumnsList();
   /**
    *
    *
@@ -183,7 +183,7 @@ public interface PartitionReadRequestOrBuilder
    * @param index The index of the element to return.
    * @return The columns at the given index.
    */
-  String getColumns(int index);
+  java.lang.String getColumns(int index);
   /**
    *
    *
@@ -232,7 +232,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return The keySet.
    */
-  KeySet getKeySet();
+  com.google.spanner.v1.KeySet getKeySet();
   /**
    *
    *
@@ -247,7 +247,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
    */
-  KeySetOrBuilder getKeySetOrBuilder();
+  com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder();
 
   /**
    *
@@ -272,7 +272,7 @@ public interface PartitionReadRequestOrBuilder
    *
    * @return The partitionOptions.
    */
-  PartitionOptions getPartitionOptions();
+  com.google.spanner.v1.PartitionOptions getPartitionOptions();
   /**
    *
    *
@@ -282,5 +282,5 @@ public interface PartitionReadRequestOrBuilder
    *
    * .google.spanner.v1.PartitionOptions partition_options = 9;
    */
-  PartitionOptionsOrBuilder getPartitionOptionsOrBuilder();
+  com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java
index 8ab264b484..7ee074e71c 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java
@@ -42,13 +42,13 @@ private PartitionResponse() {
     partitions_ = java.util.Collections.emptyList();
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PartitionResponse();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private PartitionResponse(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -75,19 +75,21 @@ private PartitionResponse(
           case 10:
             {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                partitions_ = new java.util.ArrayList();
+                partitions_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              partitions_.add(input.readMessage(Partition.parser(), extensionRegistry));
+              partitions_.add(
+                  input.readMessage(com.google.spanner.v1.Partition.parser(), extensionRegistry));
               break;
             }
           case 18:
             {
-              Transaction.Builder subBuilder = null;
+              com.google.spanner.v1.Transaction.Builder subBuilder = null;
               if (transaction_ != null) {
                 subBuilder = transaction_.toBuilder();
               }
-              transaction_ = input.readMessage(Transaction.parser(), extensionRegistry);
+              transaction_ =
+                  input.readMessage(com.google.spanner.v1.Transaction.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(transaction_);
                 transaction_ = subBuilder.buildPartial();
@@ -118,17 +120,22 @@ private PartitionResponse(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_PartitionResponse_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_PartitionResponse_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto.internal_static_google_spanner_v1_PartitionResponse_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(PartitionResponse.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_PartitionResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.PartitionResponse.class,
+            com.google.spanner.v1.PartitionResponse.Builder.class);
   }
 
   public static final int PARTITIONS_FIELD_NUMBER = 1;
-  private java.util.List partitions_;
+  private java.util.List partitions_;
   /**
    *
    *
@@ -138,8 +145,8 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  @Override
-  public java.util.List getPartitionsList() {
+  @java.lang.Override
+  public java.util.List getPartitionsList() {
     return partitions_;
   }
   /**
@@ -151,8 +158,9 @@ public java.util.List getPartitionsList() {
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  @Override
-  public java.util.List getPartitionsOrBuilderList() {
+  @java.lang.Override
+  public java.util.List
+      getPartitionsOrBuilderList() {
     return partitions_;
   }
   /**
@@ -164,7 +172,7 @@ public java.util.List getPartitionsOrBuilderList()
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  @Override
+  @java.lang.Override
   public int getPartitionsCount() {
     return partitions_.size();
   }
@@ -177,8 +185,8 @@ public int getPartitionsCount() {
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  @Override
-  public Partition getPartitions(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.Partition getPartitions(int index) {
     return partitions_.get(index);
   }
   /**
@@ -190,13 +198,13 @@ public Partition getPartitions(int index) {
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  @Override
-  public PartitionOrBuilder getPartitionsOrBuilder(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.PartitionOrBuilder getPartitionsOrBuilder(int index) {
     return partitions_.get(index);
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 2;
-  private Transaction transaction_;
+  private com.google.spanner.v1.Transaction transaction_;
   /**
    *
    *
@@ -208,7 +216,7 @@ public PartitionOrBuilder getPartitionsOrBuilder(int index) {
    *
    * @return Whether the transaction field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasTransaction() {
     return transaction_ != null;
   }
@@ -223,9 +231,11 @@ public boolean hasTransaction() {
    *
    * @return The transaction.
    */
-  @Override
-  public Transaction getTransaction() {
-    return transaction_ == null ? Transaction.getDefaultInstance() : transaction_;
+  @java.lang.Override
+  public com.google.spanner.v1.Transaction getTransaction() {
+    return transaction_ == null
+        ? com.google.spanner.v1.Transaction.getDefaultInstance()
+        : transaction_;
   }
   /**
    *
@@ -236,14 +246,14 @@ public Transaction getTransaction() {
    *
    * .google.spanner.v1.Transaction transaction = 2;
    */
-  @Override
-  public TransactionOrBuilder getTransactionOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
     return getTransaction();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -253,7 +263,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < partitions_.size(); i++) {
       output.writeMessage(1, partitions_.get(i));
@@ -264,7 +274,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -281,15 +291,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof PartitionResponse)) {
+    if (!(obj instanceof com.google.spanner.v1.PartitionResponse)) {
       return super.equals(obj);
     }
-    PartitionResponse other = (PartitionResponse) obj;
+    com.google.spanner.v1.PartitionResponse other = (com.google.spanner.v1.PartitionResponse) obj;
 
     if (!getPartitionsList().equals(other.getPartitionsList())) return false;
     if (hasTransaction() != other.hasTransaction()) return false;
@@ -300,7 +310,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -320,69 +330,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static PartitionResponse parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.PartitionResponse parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartitionResponse parseFrom(
+  public static com.google.spanner.v1.PartitionResponse parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartitionResponse parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.PartitionResponse parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartitionResponse parseFrom(
+  public static com.google.spanner.v1.PartitionResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartitionResponse parseFrom(byte[] data)
+  public static com.google.spanner.v1.PartitionResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PartitionResponse parseFrom(
+  public static com.google.spanner.v1.PartitionResponse parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PartitionResponse parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.PartitionResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static PartitionResponse parseFrom(
+  public static com.google.spanner.v1.PartitionResponse 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 PartitionResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.PartitionResponse parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static PartitionResponse parseDelimitedFrom(
+  public static com.google.spanner.v1.PartitionResponse 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 PartitionResponse parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.PartitionResponse parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static PartitionResponse parseFrom(
+  public static com.google.spanner.v1.PartitionResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -390,7 +402,7 @@ public static PartitionResponse parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -399,17 +411,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(PartitionResponse prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.PartitionResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -426,15 +438,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.PartitionResponse)
-      PartitionResponseOrBuilder {
+      com.google.spanner.v1.PartitionResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_PartitionResponse_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_PartitionResponse_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto.internal_static_google_spanner_v1_PartitionResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(PartitionResponse.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_PartitionResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.PartitionResponse.class,
+              com.google.spanner.v1.PartitionResponse.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.PartitionResponse.newBuilder()
@@ -442,7 +459,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -453,7 +470,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (partitionsBuilder_ == null) {
@@ -471,28 +488,30 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_PartitionResponse_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_PartitionResponse_descriptor;
     }
 
-    @Override
-    public PartitionResponse getDefaultInstanceForType() {
-      return PartitionResponse.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.PartitionResponse getDefaultInstanceForType() {
+      return com.google.spanner.v1.PartitionResponse.getDefaultInstance();
     }
 
-    @Override
-    public PartitionResponse build() {
-      PartitionResponse result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.PartitionResponse build() {
+      com.google.spanner.v1.PartitionResponse result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public PartitionResponse buildPartial() {
-      PartitionResponse result = new PartitionResponse(this);
+    @java.lang.Override
+    public com.google.spanner.v1.PartitionResponse buildPartial() {
+      com.google.spanner.v1.PartitionResponse result =
+          new com.google.spanner.v1.PartitionResponse(this);
       int from_bitField0_ = bitField0_;
       if (partitionsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -512,50 +531,51 @@ public PartitionResponse buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof PartitionResponse) {
-        return mergeFrom((PartitionResponse) other);
+      if (other instanceof com.google.spanner.v1.PartitionResponse) {
+        return mergeFrom((com.google.spanner.v1.PartitionResponse) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(PartitionResponse other) {
-      if (other == PartitionResponse.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.PartitionResponse other) {
+      if (other == com.google.spanner.v1.PartitionResponse.getDefaultInstance()) return this;
       if (partitionsBuilder_ == null) {
         if (!other.partitions_.isEmpty()) {
           if (partitions_.isEmpty()) {
@@ -591,21 +611,21 @@ public Builder mergeFrom(PartitionResponse other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      PartitionResponse parsedMessage = null;
+      com.google.spanner.v1.PartitionResponse parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (PartitionResponse) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.PartitionResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -617,17 +637,20 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.util.List partitions_ = java.util.Collections.emptyList();
+    private java.util.List partitions_ =
+        java.util.Collections.emptyList();
 
     private void ensurePartitionsIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        partitions_ = new java.util.ArrayList(partitions_);
+        partitions_ = new java.util.ArrayList(partitions_);
         bitField0_ |= 0x00000001;
       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            Partition, Partition.Builder, PartitionOrBuilder>
+            com.google.spanner.v1.Partition,
+            com.google.spanner.v1.Partition.Builder,
+            com.google.spanner.v1.PartitionOrBuilder>
         partitionsBuilder_;
 
     /**
@@ -639,7 +662,7 @@ private void ensurePartitionsIsMutable() {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public java.util.List getPartitionsList() {
+    public java.util.List getPartitionsList() {
       if (partitionsBuilder_ == null) {
         return java.util.Collections.unmodifiableList(partitions_);
       } else {
@@ -671,7 +694,7 @@ public int getPartitionsCount() {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Partition getPartitions(int index) {
+    public com.google.spanner.v1.Partition getPartitions(int index) {
       if (partitionsBuilder_ == null) {
         return partitions_.get(index);
       } else {
@@ -687,7 +710,7 @@ public Partition getPartitions(int index) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder setPartitions(int index, Partition value) {
+    public Builder setPartitions(int index, com.google.spanner.v1.Partition value) {
       if (partitionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -709,7 +732,8 @@ public Builder setPartitions(int index, Partition value) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder setPartitions(int index, Partition.Builder builderForValue) {
+    public Builder setPartitions(
+        int index, com.google.spanner.v1.Partition.Builder builderForValue) {
       if (partitionsBuilder_ == null) {
         ensurePartitionsIsMutable();
         partitions_.set(index, builderForValue.build());
@@ -728,7 +752,7 @@ public Builder setPartitions(int index, Partition.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder addPartitions(Partition value) {
+    public Builder addPartitions(com.google.spanner.v1.Partition value) {
       if (partitionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -750,7 +774,7 @@ public Builder addPartitions(Partition value) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder addPartitions(int index, Partition value) {
+    public Builder addPartitions(int index, com.google.spanner.v1.Partition value) {
       if (partitionsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -772,7 +796,7 @@ public Builder addPartitions(int index, Partition value) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder addPartitions(Partition.Builder builderForValue) {
+    public Builder addPartitions(com.google.spanner.v1.Partition.Builder builderForValue) {
       if (partitionsBuilder_ == null) {
         ensurePartitionsIsMutable();
         partitions_.add(builderForValue.build());
@@ -791,7 +815,8 @@ public Builder addPartitions(Partition.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder addPartitions(int index, Partition.Builder builderForValue) {
+    public Builder addPartitions(
+        int index, com.google.spanner.v1.Partition.Builder builderForValue) {
       if (partitionsBuilder_ == null) {
         ensurePartitionsIsMutable();
         partitions_.add(index, builderForValue.build());
@@ -810,7 +835,8 @@ public Builder addPartitions(int index, Partition.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Builder addAllPartitions(Iterable values) {
+    public Builder addAllPartitions(
+        java.lang.Iterable values) {
       if (partitionsBuilder_ == null) {
         ensurePartitionsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, partitions_);
@@ -867,7 +893,7 @@ public Builder removePartitions(int index) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Partition.Builder getPartitionsBuilder(int index) {
+    public com.google.spanner.v1.Partition.Builder getPartitionsBuilder(int index) {
       return getPartitionsFieldBuilder().getBuilder(index);
     }
     /**
@@ -879,7 +905,7 @@ public Partition.Builder getPartitionsBuilder(int index) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public PartitionOrBuilder getPartitionsOrBuilder(int index) {
+    public com.google.spanner.v1.PartitionOrBuilder getPartitionsOrBuilder(int index) {
       if (partitionsBuilder_ == null) {
         return partitions_.get(index);
       } else {
@@ -895,7 +921,8 @@ public PartitionOrBuilder getPartitionsOrBuilder(int index) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public java.util.List getPartitionsOrBuilderList() {
+    public java.util.List
+        getPartitionsOrBuilderList() {
       if (partitionsBuilder_ != null) {
         return partitionsBuilder_.getMessageOrBuilderList();
       } else {
@@ -911,8 +938,9 @@ public java.util.List getPartitionsOrBuilderList()
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Partition.Builder addPartitionsBuilder() {
-      return getPartitionsFieldBuilder().addBuilder(Partition.getDefaultInstance());
+    public com.google.spanner.v1.Partition.Builder addPartitionsBuilder() {
+      return getPartitionsFieldBuilder()
+          .addBuilder(com.google.spanner.v1.Partition.getDefaultInstance());
     }
     /**
      *
@@ -923,8 +951,9 @@ public Partition.Builder addPartitionsBuilder() {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public Partition.Builder addPartitionsBuilder(int index) {
-      return getPartitionsFieldBuilder().addBuilder(index, Partition.getDefaultInstance());
+    public com.google.spanner.v1.Partition.Builder addPartitionsBuilder(int index) {
+      return getPartitionsFieldBuilder()
+          .addBuilder(index, com.google.spanner.v1.Partition.getDefaultInstance());
     }
     /**
      *
@@ -935,26 +964,32 @@ public Partition.Builder addPartitionsBuilder(int index) {
      *
      * repeated .google.spanner.v1.Partition partitions = 1;
      */
-    public java.util.List getPartitionsBuilderList() {
+    public java.util.List getPartitionsBuilderList() {
       return getPartitionsFieldBuilder().getBuilderList();
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            Partition, Partition.Builder, PartitionOrBuilder>
+            com.google.spanner.v1.Partition,
+            com.google.spanner.v1.Partition.Builder,
+            com.google.spanner.v1.PartitionOrBuilder>
         getPartitionsFieldBuilder() {
       if (partitionsBuilder_ == null) {
         partitionsBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
-                Partition, Partition.Builder, PartitionOrBuilder>(
+                com.google.spanner.v1.Partition,
+                com.google.spanner.v1.Partition.Builder,
+                com.google.spanner.v1.PartitionOrBuilder>(
                 partitions_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         partitions_ = null;
       }
       return partitionsBuilder_;
     }
 
-    private Transaction transaction_;
+    private com.google.spanner.v1.Transaction transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            Transaction, Transaction.Builder, TransactionOrBuilder>
+            com.google.spanner.v1.Transaction,
+            com.google.spanner.v1.Transaction.Builder,
+            com.google.spanner.v1.TransactionOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -981,9 +1016,11 @@ public boolean hasTransaction() {
      *
      * @return The transaction.
      */
-    public Transaction getTransaction() {
+    public com.google.spanner.v1.Transaction getTransaction() {
       if (transactionBuilder_ == null) {
-        return transaction_ == null ? Transaction.getDefaultInstance() : transaction_;
+        return transaction_ == null
+            ? com.google.spanner.v1.Transaction.getDefaultInstance()
+            : transaction_;
       } else {
         return transactionBuilder_.getMessage();
       }
@@ -997,7 +1034,7 @@ public Transaction getTransaction() {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Builder setTransaction(Transaction value) {
+    public Builder setTransaction(com.google.spanner.v1.Transaction value) {
       if (transactionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1019,7 +1056,7 @@ public Builder setTransaction(Transaction value) {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Builder setTransaction(Transaction.Builder builderForValue) {
+    public Builder setTransaction(com.google.spanner.v1.Transaction.Builder builderForValue) {
       if (transactionBuilder_ == null) {
         transaction_ = builderForValue.build();
         onChanged();
@@ -1038,10 +1075,13 @@ public Builder setTransaction(Transaction.Builder builderForValue) {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Builder mergeTransaction(Transaction value) {
+    public Builder mergeTransaction(com.google.spanner.v1.Transaction value) {
       if (transactionBuilder_ == null) {
         if (transaction_ != null) {
-          transaction_ = Transaction.newBuilder(transaction_).mergeFrom(value).buildPartial();
+          transaction_ =
+              com.google.spanner.v1.Transaction.newBuilder(transaction_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           transaction_ = value;
         }
@@ -1081,7 +1121,7 @@ public Builder clearTransaction() {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Transaction.Builder getTransactionBuilder() {
+    public com.google.spanner.v1.Transaction.Builder getTransactionBuilder() {
 
       onChanged();
       return getTransactionFieldBuilder().getBuilder();
@@ -1095,11 +1135,13 @@ public Transaction.Builder getTransactionBuilder() {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public TransactionOrBuilder getTransactionOrBuilder() {
+    public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
       if (transactionBuilder_ != null) {
         return transactionBuilder_.getMessageOrBuilder();
       } else {
-        return transaction_ == null ? Transaction.getDefaultInstance() : transaction_;
+        return transaction_ == null
+            ? com.google.spanner.v1.Transaction.getDefaultInstance()
+            : transaction_;
       }
     }
     /**
@@ -1112,24 +1154,28 @@ public TransactionOrBuilder getTransactionOrBuilder() {
      * .google.spanner.v1.Transaction transaction = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            Transaction, Transaction.Builder, TransactionOrBuilder>
+            com.google.spanner.v1.Transaction,
+            com.google.spanner.v1.Transaction.Builder,
+            com.google.spanner.v1.TransactionOrBuilder>
         getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                Transaction, Transaction.Builder, TransactionOrBuilder>(
+                com.google.spanner.v1.Transaction,
+                com.google.spanner.v1.Transaction.Builder,
+                com.google.spanner.v1.TransactionOrBuilder>(
                 getTransaction(), getParentForChildren(), isClean());
         transaction_ = null;
       }
       return transactionBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1139,19 +1185,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.PartitionResponse)
-  private static final PartitionResponse DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.PartitionResponse DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new PartitionResponse();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.PartitionResponse();
   }
 
-  public static PartitionResponse getDefaultInstance() {
+  public static com.google.spanner.v1.PartitionResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public PartitionResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1164,13 +1210,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public PartitionResponse getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.PartitionResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponseOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponseOrBuilder.java
index 6a7cea77cc..0015b84f03 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponseOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponseOrBuilder.java
@@ -32,7 +32,7 @@ public interface PartitionResponseOrBuilder
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  java.util.List getPartitionsList();
+  java.util.List getPartitionsList();
   /**
    *
    *
@@ -42,7 +42,7 @@ public interface PartitionResponseOrBuilder
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  Partition getPartitions(int index);
+  com.google.spanner.v1.Partition getPartitions(int index);
   /**
    *
    *
@@ -62,7 +62,7 @@ public interface PartitionResponseOrBuilder
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  java.util.List getPartitionsOrBuilderList();
+  java.util.List getPartitionsOrBuilderList();
   /**
    *
    *
@@ -72,7 +72,7 @@ public interface PartitionResponseOrBuilder
    *
    * repeated .google.spanner.v1.Partition partitions = 1;
    */
-  PartitionOrBuilder getPartitionsOrBuilder(int index);
+  com.google.spanner.v1.PartitionOrBuilder getPartitionsOrBuilder(int index);
 
   /**
    *
@@ -97,7 +97,7 @@ public interface PartitionResponseOrBuilder
    *
    * @return The transaction.
    */
-  Transaction getTransaction();
+  com.google.spanner.v1.Transaction getTransaction();
   /**
    *
    *
@@ -107,5 +107,5 @@ public interface PartitionResponseOrBuilder
    *
    * .google.spanner.v1.Transaction transaction = 2;
    */
-  TransactionOrBuilder getTransactionOrBuilder();
+  com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java
index a8b7282a81..ce3920eccb 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java
@@ -43,13 +43,13 @@ private PlanNode() {
     childLinks_ = java.util.Collections.emptyList();
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PlanNode();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -60,7 +60,7 @@ private PlanNode(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -87,7 +87,7 @@ private PlanNode(
             }
           case 26:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               displayName_ = s;
               break;
@@ -95,20 +95,24 @@ private PlanNode(
           case 34:
             {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                childLinks_ = new java.util.ArrayList();
+                childLinks_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              childLinks_.add(input.readMessage(ChildLink.parser(), extensionRegistry));
+              childLinks_.add(
+                  input.readMessage(
+                      com.google.spanner.v1.PlanNode.ChildLink.parser(), extensionRegistry));
               break;
             }
           case 42:
             {
-              ShortRepresentation.Builder subBuilder = null;
+              com.google.spanner.v1.PlanNode.ShortRepresentation.Builder subBuilder = null;
               if (shortRepresentation_ != null) {
                 subBuilder = shortRepresentation_.toBuilder();
               }
               shortRepresentation_ =
-                  input.readMessage(ShortRepresentation.parser(), extensionRegistry);
+                  input.readMessage(
+                      com.google.spanner.v1.PlanNode.ShortRepresentation.parser(),
+                      extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(shortRepresentation_);
                 shortRepresentation_ = subBuilder.buildPartial();
@@ -168,13 +172,17 @@ private PlanNode(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_descriptor;
+    return com.google.spanner.v1.QueryPlanProto
+        .internal_static_google_spanner_v1_PlanNode_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(PlanNode.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.QueryPlanProto
+        .internal_static_google_spanner_v1_PlanNode_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.PlanNode.class, com.google.spanner.v1.PlanNode.Builder.class);
   }
 
   /**
@@ -264,7 +272,8 @@ public enum Kind implements com.google.protobuf.ProtocolMessageEnum {
 
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
-        throw new IllegalArgumentException("Can't get the number of an unknown enum value.");
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
       }
       return value;
     }
@@ -274,7 +283,7 @@ public final int getNumber() {
      * @return The enum associated with the given numeric wire value.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @Deprecated
+    @java.lang.Deprecated
     public static Kind valueOf(int value) {
       return forNumber(value);
     }
@@ -309,7 +318,8 @@ public Kind findValueByNumber(int number) {
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
       if (this == UNRECOGNIZED) {
-        throw new IllegalStateException("Can't get the descriptor of an unrecognized enum value.");
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
       }
       return getDescriptor().getValues().get(ordinal());
     }
@@ -319,14 +329,14 @@ public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType
     }
 
     public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-      return PlanNode.getDescriptor().getEnumTypes().get(0);
+      return com.google.spanner.v1.PlanNode.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final Kind[] VALUES = values();
 
     public static Kind valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new IllegalArgumentException("EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -375,7 +385,7 @@ public interface ChildLinkOrBuilder
      *
      * @return The type.
      */
-    String getType();
+    java.lang.String getType();
     /**
      *
      *
@@ -410,7 +420,7 @@ public interface ChildLinkOrBuilder
      *
      * @return The variable.
      */
-    String getVariable();
+    java.lang.String getVariable();
     /**
      *
      *
@@ -456,13 +466,13 @@ private ChildLink() {
       variable_ = "";
     }
 
-    @Override
+    @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new ChildLink();
     }
 
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -473,7 +483,7 @@ private ChildLink(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -492,14 +502,14 @@ private ChildLink(
               }
             case 18:
               {
-                String s = input.readStringRequireUtf8();
+                java.lang.String s = input.readStringRequireUtf8();
 
                 type_ = s;
                 break;
               }
             case 26:
               {
-                String s = input.readStringRequireUtf8();
+                java.lang.String s = input.readStringRequireUtf8();
 
                 variable_ = s;
                 break;
@@ -524,13 +534,18 @@ private ChildLink(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
+      return com.google.spanner.v1.QueryPlanProto
+          .internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ChildLink_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(ChildLink.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.QueryPlanProto
+          .internal_static_google_spanner_v1_PlanNode_ChildLink_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.PlanNode.ChildLink.class,
+              com.google.spanner.v1.PlanNode.ChildLink.Builder.class);
     }
 
     public static final int CHILD_INDEX_FIELD_NUMBER = 1;
@@ -546,13 +561,13 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
      *
      * @return The childIndex.
      */
-    @Override
+    @java.lang.Override
     public int getChildIndex() {
       return childIndex_;
     }
 
     public static final int TYPE_FIELD_NUMBER = 2;
-    private volatile Object type_;
+    private volatile java.lang.Object type_;
     /**
      *
      *
@@ -567,14 +582,14 @@ public int getChildIndex() {
      *
      * @return The type.
      */
-    @Override
-    public String getType() {
-      Object ref = type_;
-      if (ref instanceof String) {
-        return (String) ref;
+    @java.lang.Override
+    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;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         type_ = s;
         return s;
       }
@@ -593,12 +608,12 @@ public String getType() {
      *
      * @return The bytes for type.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ByteString getTypeBytes() {
-      Object ref = type_;
-      if (ref instanceof String) {
+      java.lang.Object ref = type_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         type_ = b;
         return b;
       } else {
@@ -607,7 +622,7 @@ public com.google.protobuf.ByteString getTypeBytes() {
     }
 
     public static final int VARIABLE_FIELD_NUMBER = 3;
-    private volatile Object variable_;
+    private volatile java.lang.Object variable_;
     /**
      *
      *
@@ -626,14 +641,14 @@ public com.google.protobuf.ByteString getTypeBytes() {
      *
      * @return The variable.
      */
-    @Override
-    public String getVariable() {
-      Object ref = variable_;
-      if (ref instanceof String) {
-        return (String) ref;
+    @java.lang.Override
+    public java.lang.String getVariable() {
+      java.lang.Object ref = variable_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         variable_ = s;
         return s;
       }
@@ -656,12 +671,12 @@ public String getVariable() {
      *
      * @return The bytes for variable.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ByteString getVariableBytes() {
-      Object ref = variable_;
-      if (ref instanceof String) {
+      java.lang.Object ref = variable_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         variable_ = b;
         return b;
       } else {
@@ -671,7 +686,7 @@ public com.google.protobuf.ByteString getVariableBytes() {
 
     private byte memoizedIsInitialized = -1;
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -681,7 +696,7 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (childIndex_ != 0) {
         output.writeInt32(1, childIndex_);
@@ -695,7 +710,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       unknownFields.writeTo(output);
     }
 
-    @Override
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -715,15 +730,16 @@ public int getSerializedSize() {
       return size;
     }
 
-    @Override
-    public boolean equals(final Object obj) {
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof ChildLink)) {
+      if (!(obj instanceof com.google.spanner.v1.PlanNode.ChildLink)) {
         return super.equals(obj);
       }
-      ChildLink other = (ChildLink) obj;
+      com.google.spanner.v1.PlanNode.ChildLink other =
+          (com.google.spanner.v1.PlanNode.ChildLink) obj;
 
       if (getChildIndex() != other.getChildIndex()) return false;
       if (!getType().equals(other.getType())) return false;
@@ -732,7 +748,7 @@ public boolean equals(final Object obj) {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -750,69 +766,71 @@ public int hashCode() {
       return hash;
     }
 
-    public static ChildLink parseFrom(java.nio.ByteBuffer data)
+    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static ChildLink parseFrom(
+    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static ChildLink parseFrom(com.google.protobuf.ByteString data)
+    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
+        com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static ChildLink parseFrom(
+    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static ChildLink parseFrom(byte[] data)
+    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static ChildLink parseFrom(
+    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static ChildLink parseFrom(java.io.InputStream input) throws java.io.IOException {
+    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static ChildLink parseFrom(
+    public static com.google.spanner.v1.PlanNode.ChildLink 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 ChildLink parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.PlanNode.ChildLink parseDelimitedFrom(
+        java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static ChildLink parseDelimitedFrom(
+    public static com.google.spanner.v1.PlanNode.ChildLink 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 ChildLink parseFrom(com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static ChildLink parseFrom(
+    public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -820,7 +838,7 @@ public static ChildLink parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @Override
+    @java.lang.Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -829,17 +847,18 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(ChildLink prototype) {
+    public static Builder newBuilder(com.google.spanner.v1.PlanNode.ChildLink prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @Override
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
     }
 
-    @Override
-    protected Builder newBuilderForType(BuilderParent parent) {
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -857,16 +876,20 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.PlanNode.ChildLink)
-        ChildLinkOrBuilder {
+        com.google.spanner.v1.PlanNode.ChildLinkOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
+        return com.google.spanner.v1.QueryPlanProto
+            .internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
       }
 
-      @Override
-      protected FieldAccessorTable internalGetFieldAccessorTable() {
-        return QueryPlanProto
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.spanner.v1.QueryPlanProto
             .internal_static_google_spanner_v1_PlanNode_ChildLink_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(ChildLink.class, Builder.class);
+            .ensureFieldAccessorsInitialized(
+                com.google.spanner.v1.PlanNode.ChildLink.class,
+                com.google.spanner.v1.PlanNode.ChildLink.Builder.class);
       }
 
       // Construct using com.google.spanner.v1.PlanNode.ChildLink.newBuilder()
@@ -874,7 +897,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -883,7 +906,7 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @Override
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         childIndex_ = 0;
@@ -895,28 +918,30 @@ public Builder clear() {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
+        return com.google.spanner.v1.QueryPlanProto
+            .internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
       }
 
-      @Override
-      public ChildLink getDefaultInstanceForType() {
-        return ChildLink.getDefaultInstance();
+      @java.lang.Override
+      public com.google.spanner.v1.PlanNode.ChildLink getDefaultInstanceForType() {
+        return com.google.spanner.v1.PlanNode.ChildLink.getDefaultInstance();
       }
 
-      @Override
-      public ChildLink build() {
-        ChildLink result = buildPartial();
+      @java.lang.Override
+      public com.google.spanner.v1.PlanNode.ChildLink build() {
+        com.google.spanner.v1.PlanNode.ChildLink result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @Override
-      public ChildLink buildPartial() {
-        ChildLink result = new ChildLink(this);
+      @java.lang.Override
+      public com.google.spanner.v1.PlanNode.ChildLink buildPartial() {
+        com.google.spanner.v1.PlanNode.ChildLink result =
+            new com.google.spanner.v1.PlanNode.ChildLink(this);
         result.childIndex_ = childIndex_;
         result.type_ = type_;
         result.variable_ = variable_;
@@ -924,50 +949,53 @@ public ChildLink buildPartial() {
         return result;
       }
 
-      @Override
+      @java.lang.Override
       public Builder clone() {
         return super.clone();
       }
 
-      @Override
-      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.setField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @Override
+      @java.lang.Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof ChildLink) {
-          return mergeFrom((ChildLink) other);
+        if (other instanceof com.google.spanner.v1.PlanNode.ChildLink) {
+          return mergeFrom((com.google.spanner.v1.PlanNode.ChildLink) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(ChildLink other) {
-        if (other == ChildLink.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.google.spanner.v1.PlanNode.ChildLink other) {
+        if (other == com.google.spanner.v1.PlanNode.ChildLink.getDefaultInstance()) return this;
         if (other.getChildIndex() != 0) {
           setChildIndex(other.getChildIndex());
         }
@@ -984,21 +1012,21 @@ public Builder mergeFrom(ChildLink other) {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        ChildLink parsedMessage = null;
+        com.google.spanner.v1.PlanNode.ChildLink parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (ChildLink) e.getUnfinishedMessage();
+          parsedMessage = (com.google.spanner.v1.PlanNode.ChildLink) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1020,7 +1048,7 @@ public Builder mergeFrom(
        *
        * @return The childIndex.
        */
-      @Override
+      @java.lang.Override
       public int getChildIndex() {
         return childIndex_;
       }
@@ -1060,7 +1088,7 @@ public Builder clearChildIndex() {
         return this;
       }
 
-      private Object type_ = "";
+      private java.lang.Object type_ = "";
       /**
        *
        *
@@ -1075,15 +1103,15 @@ public Builder clearChildIndex() {
        *
        * @return The type.
        */
-      public String getType() {
-        Object ref = type_;
-        if (!(ref instanceof String)) {
+      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;
-          String s = bs.toStringUtf8();
+          java.lang.String s = bs.toStringUtf8();
           type_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -1101,10 +1129,10 @@ public String getType() {
        * @return The bytes for type.
        */
       public com.google.protobuf.ByteString getTypeBytes() {
-        Object ref = type_;
+        java.lang.Object ref = type_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
           type_ = b;
           return b;
         } else {
@@ -1126,7 +1154,7 @@ public com.google.protobuf.ByteString getTypeBytes() {
        * @param value The type to set.
        * @return This builder for chaining.
        */
-      public Builder setType(String value) {
+      public Builder setType(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1181,7 +1209,7 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private Object variable_ = "";
+      private java.lang.Object variable_ = "";
       /**
        *
        *
@@ -1200,15 +1228,15 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
        *
        * @return The variable.
        */
-      public String getVariable() {
-        Object ref = variable_;
-        if (!(ref instanceof String)) {
+      public java.lang.String getVariable() {
+        java.lang.Object ref = variable_;
+        if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-          String s = bs.toStringUtf8();
+          java.lang.String s = bs.toStringUtf8();
           variable_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -1230,10 +1258,10 @@ public String getVariable() {
        * @return The bytes for variable.
        */
       public com.google.protobuf.ByteString getVariableBytes() {
-        Object ref = variable_;
+        java.lang.Object ref = variable_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
           variable_ = b;
           return b;
         } else {
@@ -1259,7 +1287,7 @@ public com.google.protobuf.ByteString getVariableBytes() {
        * @param value The variable to set.
        * @return This builder for chaining.
        */
-      public Builder setVariable(String value) {
+      public Builder setVariable(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1322,13 +1350,13 @@ public Builder setVariableBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @Override
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1338,19 +1366,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.PlanNode.ChildLink)
-    private static final ChildLink DEFAULT_INSTANCE;
+    private static final com.google.spanner.v1.PlanNode.ChildLink DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new ChildLink();
+      DEFAULT_INSTANCE = new com.google.spanner.v1.PlanNode.ChildLink();
     }
 
-    public static ChildLink getDefaultInstance() {
+    public static com.google.spanner.v1.PlanNode.ChildLink getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @Override
+          @java.lang.Override
           public ChildLink parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1363,13 +1391,13 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @Override
-    public ChildLink getDefaultInstanceForType() {
+    @java.lang.Override
+    public com.google.spanner.v1.PlanNode.ChildLink getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
@@ -1390,7 +1418,7 @@ public interface ShortRepresentationOrBuilder
      *
      * @return The description.
      */
-    String getDescription();
+    java.lang.String getDescription();
     /**
      *
      *
@@ -1431,10 +1459,10 @@ public interface ShortRepresentationOrBuilder
      *
      * map<string, int32> subqueries = 2;
      */
-    boolean containsSubqueries(String key);
+    boolean containsSubqueries(java.lang.String key);
     /** Use {@link #getSubqueriesMap()} instead. */
-    @Deprecated
-    java.util.Map getSubqueries();
+    @java.lang.Deprecated
+    java.util.Map getSubqueries();
     /**
      *
      *
@@ -1448,7 +1476,7 @@ public interface ShortRepresentationOrBuilder
      *
      * map<string, int32> subqueries = 2;
      */
-    java.util.Map getSubqueriesMap();
+    java.util.Map getSubqueriesMap();
     /**
      *
      *
@@ -1462,7 +1490,7 @@ public interface ShortRepresentationOrBuilder
      *
      * map<string, int32> subqueries = 2;
      */
-    int getSubqueriesOrDefault(String key, int defaultValue);
+    int getSubqueriesOrDefault(java.lang.String key, int defaultValue);
     /**
      *
      *
@@ -1476,7 +1504,7 @@ public interface ShortRepresentationOrBuilder
      *
      * map<string, int32> subqueries = 2;
      */
-    int getSubqueriesOrThrow(String key);
+    int getSubqueriesOrThrow(java.lang.String key);
   }
   /**
    *
@@ -1502,13 +1530,13 @@ private ShortRepresentation() {
       description_ = "";
     }
 
-    @Override
+    @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new ShortRepresentation();
     }
 
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -1519,7 +1547,7 @@ private ShortRepresentation(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -1534,7 +1562,7 @@ private ShortRepresentation(
               break;
             case 10:
               {
-                String s = input.readStringRequireUtf8();
+                java.lang.String s = input.readStringRequireUtf8();
 
                 description_ = s;
                 break;
@@ -1547,7 +1575,7 @@ private ShortRepresentation(
                           SubqueriesDefaultEntryHolder.defaultEntry);
                   mutable_bitField0_ |= 0x00000001;
                 }
-                com.google.protobuf.MapEntry subqueries__ =
+                com.google.protobuf.MapEntry subqueries__ =
                     input.readMessage(
                         SubqueriesDefaultEntryHolder.defaultEntry.getParserForType(),
                         extensionRegistry);
@@ -1574,12 +1602,12 @@ private ShortRepresentation(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return QueryPlanProto
+      return com.google.spanner.v1.QueryPlanProto
           .internal_static_google_spanner_v1_PlanNode_ShortRepresentation_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
-    @Override
+    @java.lang.Override
     protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 2:
@@ -1589,15 +1617,18 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
       }
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return QueryPlanProto
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.QueryPlanProto
           .internal_static_google_spanner_v1_PlanNode_ShortRepresentation_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(ShortRepresentation.class, Builder.class);
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.PlanNode.ShortRepresentation.class,
+              com.google.spanner.v1.PlanNode.ShortRepresentation.Builder.class);
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 1;
-    private volatile Object description_;
+    private volatile java.lang.Object description_;
     /**
      *
      *
@@ -1609,14 +1640,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
      *
      * @return The description.
      */
-    @Override
-    public String getDescription() {
-      Object ref = description_;
-      if (ref instanceof String) {
-        return (String) ref;
+    @java.lang.Override
+    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;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         description_ = s;
         return s;
       }
@@ -1632,12 +1663,12 @@ public String getDescription() {
      *
      * @return The bytes for description.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ByteString getDescriptionBytes() {
-      Object ref = description_;
-      if (ref instanceof String) {
+      java.lang.Object ref = description_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         description_ = b;
         return b;
       } else {
@@ -1648,9 +1679,9 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
     public static final int SUBQUERIES_FIELD_NUMBER = 2;
 
     private static final class SubqueriesDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry defaultEntry =
-          com.google.protobuf.MapEntry.newDefaultInstance(
-              QueryPlanProto
+      static final com.google.protobuf.MapEntry defaultEntry =
+          com.google.protobuf.MapEntry.newDefaultInstance(
+              com.google.spanner.v1.QueryPlanProto
                   .internal_static_google_spanner_v1_PlanNode_ShortRepresentation_SubqueriesEntry_descriptor,
               com.google.protobuf.WireFormat.FieldType.STRING,
               "",
@@ -1658,9 +1689,10 @@ private static final class SubqueriesDefaultEntryHolder {
               0);
     }
 
-    private com.google.protobuf.MapField subqueries_;
+    private com.google.protobuf.MapField subqueries_;
 
-    private com.google.protobuf.MapField internalGetSubqueries() {
+    private com.google.protobuf.MapField
+        internalGetSubqueries() {
       if (subqueries_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             SubqueriesDefaultEntryHolder.defaultEntry);
@@ -1684,17 +1716,17 @@ public int getSubqueriesCount() {
      *
      * map<string, int32> subqueries = 2;
      */
-    @Override
-    public boolean containsSubqueries(String key) {
+    @java.lang.Override
+    public boolean containsSubqueries(java.lang.String key) {
       if (key == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       return internalGetSubqueries().getMap().containsKey(key);
     }
     /** Use {@link #getSubqueriesMap()} instead. */
-    @Override
-    @Deprecated
-    public java.util.Map getSubqueries() {
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map getSubqueries() {
       return getSubqueriesMap();
     }
     /**
@@ -1710,8 +1742,8 @@ public java.util.Map getSubqueries() {
      *
      * map<string, int32> subqueries = 2;
      */
-    @Override
-    public java.util.Map getSubqueriesMap() {
+    @java.lang.Override
+    public java.util.Map getSubqueriesMap() {
       return internalGetSubqueries().getMap();
     }
     /**
@@ -1727,12 +1759,12 @@ public java.util.Map getSubqueriesMap() {
      *
      * map<string, int32> subqueries = 2;
      */
-    @Override
-    public int getSubqueriesOrDefault(String key, int defaultValue) {
+    @java.lang.Override
+    public int getSubqueriesOrDefault(java.lang.String key, int defaultValue) {
       if (key == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
-      java.util.Map map = internalGetSubqueries().getMap();
+      java.util.Map map = internalGetSubqueries().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
@@ -1748,21 +1780,21 @@ public int getSubqueriesOrDefault(String key, int defaultValue) {
      *
      * map<string, int32> subqueries = 2;
      */
-    @Override
-    public int getSubqueriesOrThrow(String key) {
+    @java.lang.Override
+    public int getSubqueriesOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
-      java.util.Map map = internalGetSubqueries().getMap();
+      java.util.Map map = internalGetSubqueries().getMap();
       if (!map.containsKey(key)) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
       return map.get(key);
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1772,7 +1804,7 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (!getDescriptionBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, description_);
@@ -1782,7 +1814,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       unknownFields.writeTo(output);
     }
 
-    @Override
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1791,9 +1823,9 @@ public int getSerializedSize() {
       if (!getDescriptionBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, description_);
       }
-      for (java.util.Map.Entry entry :
+      for (java.util.Map.Entry entry :
           internalGetSubqueries().getMap().entrySet()) {
-        com.google.protobuf.MapEntry subqueries__ =
+        com.google.protobuf.MapEntry subqueries__ =
             SubqueriesDefaultEntryHolder.defaultEntry
                 .newBuilderForType()
                 .setKey(entry.getKey())
@@ -1806,15 +1838,16 @@ public int getSerializedSize() {
       return size;
     }
 
-    @Override
-    public boolean equals(final Object obj) {
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof ShortRepresentation)) {
+      if (!(obj instanceof com.google.spanner.v1.PlanNode.ShortRepresentation)) {
         return super.equals(obj);
       }
-      ShortRepresentation other = (ShortRepresentation) obj;
+      com.google.spanner.v1.PlanNode.ShortRepresentation other =
+          (com.google.spanner.v1.PlanNode.ShortRepresentation) obj;
 
       if (!getDescription().equals(other.getDescription())) return false;
       if (!internalGetSubqueries().equals(other.internalGetSubqueries())) return false;
@@ -1822,7 +1855,7 @@ public boolean equals(final Object obj) {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -1840,70 +1873,71 @@ public int hashCode() {
       return hash;
     }
 
-    public static ShortRepresentation parseFrom(java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
+        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static ShortRepresentation parseFrom(
+    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static ShortRepresentation parseFrom(com.google.protobuf.ByteString data)
+    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
+        com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static ShortRepresentation parseFrom(
+    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static ShortRepresentation parseFrom(byte[] data)
+    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static ShortRepresentation parseFrom(
+    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static ShortRepresentation parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
+        java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static ShortRepresentation parseFrom(
+    public static com.google.spanner.v1.PlanNode.ShortRepresentation 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 ShortRepresentation parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseDelimitedFrom(
+        java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static ShortRepresentation parseDelimitedFrom(
+    public static com.google.spanner.v1.PlanNode.ShortRepresentation 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 ShortRepresentation parseFrom(com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static ShortRepresentation parseFrom(
+    public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1911,7 +1945,7 @@ public static ShortRepresentation parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @Override
+    @java.lang.Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -1920,17 +1954,18 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(ShortRepresentation prototype) {
+    public static Builder newBuilder(com.google.spanner.v1.PlanNode.ShortRepresentation prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @Override
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
     }
 
-    @Override
-    protected Builder newBuilderForType(BuilderParent parent) {
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1948,9 +1983,9 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.PlanNode.ShortRepresentation)
-        ShortRepresentationOrBuilder {
+        com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return QueryPlanProto
+        return com.google.spanner.v1.QueryPlanProto
             .internal_static_google_spanner_v1_PlanNode_ShortRepresentation_descriptor;
       }
 
@@ -1974,11 +2009,14 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
         }
       }
 
-      @Override
-      protected FieldAccessorTable internalGetFieldAccessorTable() {
-        return QueryPlanProto
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.spanner.v1.QueryPlanProto
             .internal_static_google_spanner_v1_PlanNode_ShortRepresentation_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(ShortRepresentation.class, Builder.class);
+            .ensureFieldAccessorsInitialized(
+                com.google.spanner.v1.PlanNode.ShortRepresentation.class,
+                com.google.spanner.v1.PlanNode.ShortRepresentation.Builder.class);
       }
 
       // Construct using com.google.spanner.v1.PlanNode.ShortRepresentation.newBuilder()
@@ -1986,7 +2024,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -1995,7 +2033,7 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @Override
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         description_ = "";
@@ -2004,29 +2042,30 @@ public Builder clear() {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return QueryPlanProto
+        return com.google.spanner.v1.QueryPlanProto
             .internal_static_google_spanner_v1_PlanNode_ShortRepresentation_descriptor;
       }
 
-      @Override
-      public ShortRepresentation getDefaultInstanceForType() {
-        return ShortRepresentation.getDefaultInstance();
+      @java.lang.Override
+      public com.google.spanner.v1.PlanNode.ShortRepresentation getDefaultInstanceForType() {
+        return com.google.spanner.v1.PlanNode.ShortRepresentation.getDefaultInstance();
       }
 
-      @Override
-      public ShortRepresentation build() {
-        ShortRepresentation result = buildPartial();
+      @java.lang.Override
+      public com.google.spanner.v1.PlanNode.ShortRepresentation build() {
+        com.google.spanner.v1.PlanNode.ShortRepresentation result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @Override
-      public ShortRepresentation buildPartial() {
-        ShortRepresentation result = new ShortRepresentation(this);
+      @java.lang.Override
+      public com.google.spanner.v1.PlanNode.ShortRepresentation buildPartial() {
+        com.google.spanner.v1.PlanNode.ShortRepresentation result =
+            new com.google.spanner.v1.PlanNode.ShortRepresentation(this);
         int from_bitField0_ = bitField0_;
         result.description_ = description_;
         result.subqueries_ = internalGetSubqueries();
@@ -2035,50 +2074,54 @@ public ShortRepresentation buildPartial() {
         return result;
       }
 
-      @Override
+      @java.lang.Override
       public Builder clone() {
         return super.clone();
       }
 
-      @Override
-      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.setField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @Override
+      @java.lang.Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof ShortRepresentation) {
-          return mergeFrom((ShortRepresentation) other);
+        if (other instanceof com.google.spanner.v1.PlanNode.ShortRepresentation) {
+          return mergeFrom((com.google.spanner.v1.PlanNode.ShortRepresentation) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(ShortRepresentation other) {
-        if (other == ShortRepresentation.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.google.spanner.v1.PlanNode.ShortRepresentation other) {
+        if (other == com.google.spanner.v1.PlanNode.ShortRepresentation.getDefaultInstance())
+          return this;
         if (!other.getDescription().isEmpty()) {
           description_ = other.description_;
           onChanged();
@@ -2089,21 +2132,22 @@ public Builder mergeFrom(ShortRepresentation other) {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        ShortRepresentation parsedMessage = null;
+        com.google.spanner.v1.PlanNode.ShortRepresentation parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (ShortRepresentation) e.getUnfinishedMessage();
+          parsedMessage =
+              (com.google.spanner.v1.PlanNode.ShortRepresentation) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2115,7 +2159,7 @@ public Builder mergeFrom(
 
       private int bitField0_;
 
-      private Object description_ = "";
+      private java.lang.Object description_ = "";
       /**
        *
        *
@@ -2127,15 +2171,15 @@ public Builder mergeFrom(
        *
        * @return The description.
        */
-      public String getDescription() {
-        Object ref = description_;
-        if (!(ref instanceof String)) {
+      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;
-          String s = bs.toStringUtf8();
+          java.lang.String s = bs.toStringUtf8();
           description_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -2150,10 +2194,10 @@ public String getDescription() {
        * @return The bytes for description.
        */
       public com.google.protobuf.ByteString getDescriptionBytes() {
-        Object ref = description_;
+        java.lang.Object ref = description_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
           description_ = b;
           return b;
         } else {
@@ -2172,7 +2216,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
        * @param value The description to set.
        * @return This builder for chaining.
        */
-      public Builder setDescription(String value) {
+      public Builder setDescription(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2221,9 +2265,10 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private com.google.protobuf.MapField subqueries_;
+      private com.google.protobuf.MapField subqueries_;
 
-      private com.google.protobuf.MapField internalGetSubqueries() {
+      private com.google.protobuf.MapField
+          internalGetSubqueries() {
         if (subqueries_ == null) {
           return com.google.protobuf.MapField.emptyMapField(
               SubqueriesDefaultEntryHolder.defaultEntry);
@@ -2231,7 +2276,8 @@ private com.google.protobuf.MapField internalGetSubqueries() {
         return subqueries_;
       }
 
-      private com.google.protobuf.MapField internalGetMutableSubqueries() {
+      private com.google.protobuf.MapField
+          internalGetMutableSubqueries() {
         onChanged();
         ;
         if (subqueries_ == null) {
@@ -2260,17 +2306,17 @@ public int getSubqueriesCount() {
        *
        * map<string, int32> subqueries = 2;
        */
-      @Override
-      public boolean containsSubqueries(String key) {
+      @java.lang.Override
+      public boolean containsSubqueries(java.lang.String key) {
         if (key == null) {
-          throw new NullPointerException();
+          throw new java.lang.NullPointerException();
         }
         return internalGetSubqueries().getMap().containsKey(key);
       }
       /** Use {@link #getSubqueriesMap()} instead. */
-      @Override
-      @Deprecated
-      public java.util.Map getSubqueries() {
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map getSubqueries() {
         return getSubqueriesMap();
       }
       /**
@@ -2286,8 +2332,8 @@ public java.util.Map getSubqueries() {
        *
        * map<string, int32> subqueries = 2;
        */
-      @Override
-      public java.util.Map getSubqueriesMap() {
+      @java.lang.Override
+      public java.util.Map getSubqueriesMap() {
         return internalGetSubqueries().getMap();
       }
       /**
@@ -2303,12 +2349,12 @@ public java.util.Map getSubqueriesMap() {
        *
        * map<string, int32> subqueries = 2;
        */
-      @Override
-      public int getSubqueriesOrDefault(String key, int defaultValue) {
+      @java.lang.Override
+      public int getSubqueriesOrDefault(java.lang.String key, int defaultValue) {
         if (key == null) {
-          throw new NullPointerException();
+          throw new java.lang.NullPointerException();
         }
-        java.util.Map map = internalGetSubqueries().getMap();
+        java.util.Map map = internalGetSubqueries().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
@@ -2324,14 +2370,14 @@ public int getSubqueriesOrDefault(String key, int defaultValue) {
        *
        * map<string, int32> subqueries = 2;
        */
-      @Override
-      public int getSubqueriesOrThrow(String key) {
+      @java.lang.Override
+      public int getSubqueriesOrThrow(java.lang.String key) {
         if (key == null) {
-          throw new NullPointerException();
+          throw new java.lang.NullPointerException();
         }
-        java.util.Map map = internalGetSubqueries().getMap();
+        java.util.Map map = internalGetSubqueries().getMap();
         if (!map.containsKey(key)) {
-          throw new IllegalArgumentException();
+          throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
@@ -2353,16 +2399,16 @@ public Builder clearSubqueries() {
        *
        * map<string, int32> subqueries = 2;
        */
-      public Builder removeSubqueries(String key) {
+      public Builder removeSubqueries(java.lang.String key) {
         if (key == null) {
-          throw new NullPointerException();
+          throw new java.lang.NullPointerException();
         }
         internalGetMutableSubqueries().getMutableMap().remove(key);
         return this;
       }
       /** Use alternate mutation accessors instead. */
-      @Deprecated
-      public java.util.Map getMutableSubqueries() {
+      @java.lang.Deprecated
+      public java.util.Map getMutableSubqueries() {
         return internalGetMutableSubqueries().getMutableMap();
       }
       /**
@@ -2378,9 +2424,9 @@ public java.util.Map getMutableSubqueries() {
        *
        * map<string, int32> subqueries = 2;
        */
-      public Builder putSubqueries(String key, int value) {
+      public Builder putSubqueries(java.lang.String key, int value) {
         if (key == null) {
-          throw new NullPointerException();
+          throw new java.lang.NullPointerException();
         }
 
         internalGetMutableSubqueries().getMutableMap().put(key, value);
@@ -2399,18 +2445,18 @@ public Builder putSubqueries(String key, int value) {
        *
        * map<string, int32> subqueries = 2;
        */
-      public Builder putAllSubqueries(java.util.Map values) {
+      public Builder putAllSubqueries(java.util.Map values) {
         internalGetMutableSubqueries().getMutableMap().putAll(values);
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @Override
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2420,19 +2466,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.PlanNode.ShortRepresentation)
-    private static final ShortRepresentation DEFAULT_INSTANCE;
+    private static final com.google.spanner.v1.PlanNode.ShortRepresentation DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new ShortRepresentation();
+      DEFAULT_INSTANCE = new com.google.spanner.v1.PlanNode.ShortRepresentation();
     }
 
-    public static ShortRepresentation getDefaultInstance() {
+    public static com.google.spanner.v1.PlanNode.ShortRepresentation getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @Override
+          @java.lang.Override
           public ShortRepresentation parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2445,13 +2491,13 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @Override
-    public ShortRepresentation getDefaultInstanceForType() {
+    @java.lang.Override
+    public com.google.spanner.v1.PlanNode.ShortRepresentation getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
@@ -2469,7 +2515,7 @@ public ShortRepresentation getDefaultInstanceForType() {
    *
    * @return The index.
    */
-  @Override
+  @java.lang.Override
   public int getIndex() {
     return index_;
   }
@@ -2491,7 +2537,7 @@ public int getIndex() {
    *
    * @return The enum numeric value on the wire for kind.
    */
-  @Override
+  @java.lang.Override
   public int getKindValue() {
     return kind_;
   }
@@ -2510,15 +2556,15 @@ public int getKindValue() {
    *
    * @return The kind.
    */
-  @Override
-  public Kind getKind() {
+  @java.lang.Override
+  public com.google.spanner.v1.PlanNode.Kind getKind() {
     @SuppressWarnings("deprecation")
-    Kind result = Kind.valueOf(kind_);
-    return result == null ? Kind.UNRECOGNIZED : result;
+    com.google.spanner.v1.PlanNode.Kind result = com.google.spanner.v1.PlanNode.Kind.valueOf(kind_);
+    return result == null ? com.google.spanner.v1.PlanNode.Kind.UNRECOGNIZED : result;
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 3;
-  private volatile Object displayName_;
+  private volatile java.lang.Object displayName_;
   /**
    *
    *
@@ -2530,14 +2576,14 @@ public Kind getKind() {
    *
    * @return The displayName.
    */
-  @Override
-  public String getDisplayName() {
-    Object ref = displayName_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  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;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       displayName_ = s;
       return s;
     }
@@ -2553,11 +2599,12 @@ public String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
-    Object ref = displayName_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    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 {
@@ -2566,7 +2613,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int CHILD_LINKS_FIELD_NUMBER = 4;
-  private java.util.List childLinks_;
+  private java.util.List childLinks_;
   /**
    *
    *
@@ -2576,8 +2623,8 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  @Override
-  public java.util.List getChildLinksList() {
+  @java.lang.Override
+  public java.util.List getChildLinksList() {
     return childLinks_;
   }
   /**
@@ -2589,8 +2636,9 @@ public java.util.List getChildLinksList() {
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  @Override
-  public java.util.List getChildLinksOrBuilderList() {
+  @java.lang.Override
+  public java.util.List
+      getChildLinksOrBuilderList() {
     return childLinks_;
   }
   /**
@@ -2602,7 +2650,7 @@ public java.util.List getChildLinksOrBuilderList()
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  @Override
+  @java.lang.Override
   public int getChildLinksCount() {
     return childLinks_.size();
   }
@@ -2615,8 +2663,8 @@ public int getChildLinksCount() {
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  @Override
-  public ChildLink getChildLinks(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.PlanNode.ChildLink getChildLinks(int index) {
     return childLinks_.get(index);
   }
   /**
@@ -2628,13 +2676,13 @@ public ChildLink getChildLinks(int index) {
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  @Override
-  public ChildLinkOrBuilder getChildLinksOrBuilder(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.PlanNode.ChildLinkOrBuilder getChildLinksOrBuilder(int index) {
     return childLinks_.get(index);
   }
 
   public static final int SHORT_REPRESENTATION_FIELD_NUMBER = 5;
-  private ShortRepresentation shortRepresentation_;
+  private com.google.spanner.v1.PlanNode.ShortRepresentation shortRepresentation_;
   /**
    *
    *
@@ -2646,7 +2694,7 @@ public ChildLinkOrBuilder getChildLinksOrBuilder(int index) {
    *
    * @return Whether the shortRepresentation field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasShortRepresentation() {
     return shortRepresentation_ != null;
   }
@@ -2661,10 +2709,10 @@ public boolean hasShortRepresentation() {
    *
    * @return The shortRepresentation.
    */
-  @Override
-  public ShortRepresentation getShortRepresentation() {
+  @java.lang.Override
+  public com.google.spanner.v1.PlanNode.ShortRepresentation getShortRepresentation() {
     return shortRepresentation_ == null
-        ? ShortRepresentation.getDefaultInstance()
+        ? com.google.spanner.v1.PlanNode.ShortRepresentation.getDefaultInstance()
         : shortRepresentation_;
   }
   /**
@@ -2676,8 +2724,9 @@ public ShortRepresentation getShortRepresentation() {
    *
    * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
    */
-  @Override
-  public ShortRepresentationOrBuilder getShortRepresentationOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder
+      getShortRepresentationOrBuilder() {
     return getShortRepresentation();
   }
 
@@ -2700,7 +2749,7 @@ public ShortRepresentationOrBuilder getShortRepresentationOrBuilder() {
    *
    * @return Whether the metadata field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasMetadata() {
     return metadata_ != null;
   }
@@ -2721,7 +2770,7 @@ public boolean hasMetadata() {
    *
    * @return The metadata.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Struct getMetadata() {
     return metadata_ == null ? com.google.protobuf.Struct.getDefaultInstance() : metadata_;
   }
@@ -2740,7 +2789,7 @@ public com.google.protobuf.Struct getMetadata() {
    *
    * .google.protobuf.Struct metadata = 6;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.StructOrBuilder getMetadataOrBuilder() {
     return getMetadata();
   }
@@ -2761,7 +2810,7 @@ public com.google.protobuf.StructOrBuilder getMetadataOrBuilder() {
    *
    * @return Whether the executionStats field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasExecutionStats() {
     return executionStats_ != null;
   }
@@ -2779,7 +2828,7 @@ public boolean hasExecutionStats() {
    *
    * @return The executionStats.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Struct getExecutionStats() {
     return executionStats_ == null
         ? com.google.protobuf.Struct.getDefaultInstance()
@@ -2797,14 +2846,14 @@ public com.google.protobuf.Struct getExecutionStats() {
    *
    * .google.protobuf.Struct execution_stats = 7;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.StructOrBuilder getExecutionStatsOrBuilder() {
     return getExecutionStats();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2814,12 +2863,12 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (index_ != 0) {
       output.writeInt32(1, index_);
     }
-    if (kind_ != Kind.KIND_UNSPECIFIED.getNumber()) {
+    if (kind_ != com.google.spanner.v1.PlanNode.Kind.KIND_UNSPECIFIED.getNumber()) {
       output.writeEnum(2, kind_);
     }
     if (!getDisplayNameBytes().isEmpty()) {
@@ -2840,7 +2889,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2849,7 +2898,7 @@ public int getSerializedSize() {
     if (index_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, index_);
     }
-    if (kind_ != Kind.KIND_UNSPECIFIED.getNumber()) {
+    if (kind_ != com.google.spanner.v1.PlanNode.Kind.KIND_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, kind_);
     }
     if (!getDisplayNameBytes().isEmpty()) {
@@ -2872,15 +2921,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof PlanNode)) {
+    if (!(obj instanceof com.google.spanner.v1.PlanNode)) {
       return super.equals(obj);
     }
-    PlanNode other = (PlanNode) obj;
+    com.google.spanner.v1.PlanNode other = (com.google.spanner.v1.PlanNode) obj;
 
     if (getIndex() != other.getIndex()) return false;
     if (kind_ != other.kind_) return false;
@@ -2902,7 +2951,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -2936,68 +2985,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static PlanNode parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.PlanNode parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PlanNode parseFrom(
+  public static com.google.spanner.v1.PlanNode parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PlanNode parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.PlanNode parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PlanNode parseFrom(
+  public static com.google.spanner.v1.PlanNode parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PlanNode parseFrom(byte[] data)
+  public static com.google.spanner.v1.PlanNode parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static PlanNode parseFrom(
+  public static com.google.spanner.v1.PlanNode parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static PlanNode parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.PlanNode parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static PlanNode parseFrom(
+  public static com.google.spanner.v1.PlanNode 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 PlanNode parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.PlanNode parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static PlanNode parseDelimitedFrom(
+  public static com.google.spanner.v1.PlanNode 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 PlanNode parseFrom(com.google.protobuf.CodedInputStream input)
+  public static com.google.spanner.v1.PlanNode parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static PlanNode parseFrom(
+  public static com.google.spanner.v1.PlanNode parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -3005,7 +3056,7 @@ public static PlanNode parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -3014,17 +3065,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(PlanNode prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.PlanNode prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -3040,15 +3091,19 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.PlanNode)
-      PlanNodeOrBuilder {
+      com.google.spanner.v1.PlanNodeOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_descriptor;
+      return com.google.spanner.v1.QueryPlanProto
+          .internal_static_google_spanner_v1_PlanNode_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(PlanNode.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.QueryPlanProto
+          .internal_static_google_spanner_v1_PlanNode_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.PlanNode.class, com.google.spanner.v1.PlanNode.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.PlanNode.newBuilder()
@@ -3056,7 +3111,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -3067,7 +3122,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       index_ = 0;
@@ -3103,28 +3158,29 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return QueryPlanProto.internal_static_google_spanner_v1_PlanNode_descriptor;
+      return com.google.spanner.v1.QueryPlanProto
+          .internal_static_google_spanner_v1_PlanNode_descriptor;
     }
 
-    @Override
-    public PlanNode getDefaultInstanceForType() {
-      return PlanNode.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.PlanNode getDefaultInstanceForType() {
+      return com.google.spanner.v1.PlanNode.getDefaultInstance();
     }
 
-    @Override
-    public PlanNode build() {
-      PlanNode result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.PlanNode build() {
+      com.google.spanner.v1.PlanNode result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public PlanNode buildPartial() {
-      PlanNode result = new PlanNode(this);
+    @java.lang.Override
+    public com.google.spanner.v1.PlanNode buildPartial() {
+      com.google.spanner.v1.PlanNode result = new com.google.spanner.v1.PlanNode(this);
       int from_bitField0_ = bitField0_;
       result.index_ = index_;
       result.kind_ = kind_;
@@ -3157,50 +3213,51 @@ public PlanNode buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof PlanNode) {
-        return mergeFrom((PlanNode) other);
+      if (other instanceof com.google.spanner.v1.PlanNode) {
+        return mergeFrom((com.google.spanner.v1.PlanNode) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(PlanNode other) {
-      if (other == PlanNode.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.PlanNode other) {
+      if (other == com.google.spanner.v1.PlanNode.getDefaultInstance()) return this;
       if (other.getIndex() != 0) {
         setIndex(other.getIndex());
       }
@@ -3252,21 +3309,21 @@ public Builder mergeFrom(PlanNode other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      PlanNode parsedMessage = null;
+      com.google.spanner.v1.PlanNode parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (PlanNode) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.PlanNode) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -3290,7 +3347,7 @@ public Builder mergeFrom(
      *
      * @return The index.
      */
-    @Override
+    @java.lang.Override
     public int getIndex() {
       return index_;
     }
@@ -3346,7 +3403,7 @@ public Builder clearIndex() {
      *
      * @return The enum numeric value on the wire for kind.
      */
-    @Override
+    @java.lang.Override
     public int getKindValue() {
       return kind_;
     }
@@ -3387,11 +3444,12 @@ public Builder setKindValue(int value) {
      *
      * @return The kind.
      */
-    @Override
-    public Kind getKind() {
+    @java.lang.Override
+    public com.google.spanner.v1.PlanNode.Kind getKind() {
       @SuppressWarnings("deprecation")
-      Kind result = Kind.valueOf(kind_);
-      return result == null ? Kind.UNRECOGNIZED : result;
+      com.google.spanner.v1.PlanNode.Kind result =
+          com.google.spanner.v1.PlanNode.Kind.valueOf(kind_);
+      return result == null ? com.google.spanner.v1.PlanNode.Kind.UNRECOGNIZED : result;
     }
     /**
      *
@@ -3409,7 +3467,7 @@ public Kind getKind() {
      * @param value The kind to set.
      * @return This builder for chaining.
      */
-    public Builder setKind(Kind value) {
+    public Builder setKind(com.google.spanner.v1.PlanNode.Kind value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -3440,7 +3498,7 @@ public Builder clearKind() {
       return this;
     }
 
-    private Object displayName_ = "";
+    private java.lang.Object displayName_ = "";
     /**
      *
      *
@@ -3452,15 +3510,15 @@ public Builder clearKind() {
      *
      * @return The displayName.
      */
-    public String getDisplayName() {
-      Object ref = displayName_;
-      if (!(ref instanceof String)) {
+    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;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         displayName_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -3475,10 +3533,10 @@ public String getDisplayName() {
      * @return The bytes for displayName.
      */
     public com.google.protobuf.ByteString getDisplayNameBytes() {
-      Object ref = displayName_;
+      java.lang.Object ref = displayName_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         displayName_ = b;
         return b;
       } else {
@@ -3497,7 +3555,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
      * @param value The displayName to set.
      * @return This builder for chaining.
      */
-    public Builder setDisplayName(String value) {
+    public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -3546,17 +3604,21 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private java.util.List childLinks_ = java.util.Collections.emptyList();
+    private java.util.List childLinks_ =
+        java.util.Collections.emptyList();
 
     private void ensureChildLinksIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        childLinks_ = new java.util.ArrayList(childLinks_);
+        childLinks_ =
+            new java.util.ArrayList(childLinks_);
         bitField0_ |= 0x00000001;
       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            ChildLink, ChildLink.Builder, ChildLinkOrBuilder>
+            com.google.spanner.v1.PlanNode.ChildLink,
+            com.google.spanner.v1.PlanNode.ChildLink.Builder,
+            com.google.spanner.v1.PlanNode.ChildLinkOrBuilder>
         childLinksBuilder_;
 
     /**
@@ -3568,7 +3630,7 @@ private void ensureChildLinksIsMutable() {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public java.util.List getChildLinksList() {
+    public java.util.List getChildLinksList() {
       if (childLinksBuilder_ == null) {
         return java.util.Collections.unmodifiableList(childLinks_);
       } else {
@@ -3600,7 +3662,7 @@ public int getChildLinksCount() {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public ChildLink getChildLinks(int index) {
+    public com.google.spanner.v1.PlanNode.ChildLink getChildLinks(int index) {
       if (childLinksBuilder_ == null) {
         return childLinks_.get(index);
       } else {
@@ -3616,7 +3678,7 @@ public ChildLink getChildLinks(int index) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder setChildLinks(int index, ChildLink value) {
+    public Builder setChildLinks(int index, com.google.spanner.v1.PlanNode.ChildLink value) {
       if (childLinksBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -3638,7 +3700,8 @@ public Builder setChildLinks(int index, ChildLink value) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder setChildLinks(int index, ChildLink.Builder builderForValue) {
+    public Builder setChildLinks(
+        int index, com.google.spanner.v1.PlanNode.ChildLink.Builder builderForValue) {
       if (childLinksBuilder_ == null) {
         ensureChildLinksIsMutable();
         childLinks_.set(index, builderForValue.build());
@@ -3657,7 +3720,7 @@ public Builder setChildLinks(int index, ChildLink.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder addChildLinks(ChildLink value) {
+    public Builder addChildLinks(com.google.spanner.v1.PlanNode.ChildLink value) {
       if (childLinksBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -3679,7 +3742,7 @@ public Builder addChildLinks(ChildLink value) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder addChildLinks(int index, ChildLink value) {
+    public Builder addChildLinks(int index, com.google.spanner.v1.PlanNode.ChildLink value) {
       if (childLinksBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -3701,7 +3764,7 @@ public Builder addChildLinks(int index, ChildLink value) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder addChildLinks(ChildLink.Builder builderForValue) {
+    public Builder addChildLinks(com.google.spanner.v1.PlanNode.ChildLink.Builder builderForValue) {
       if (childLinksBuilder_ == null) {
         ensureChildLinksIsMutable();
         childLinks_.add(builderForValue.build());
@@ -3720,7 +3783,8 @@ public Builder addChildLinks(ChildLink.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder addChildLinks(int index, ChildLink.Builder builderForValue) {
+    public Builder addChildLinks(
+        int index, com.google.spanner.v1.PlanNode.ChildLink.Builder builderForValue) {
       if (childLinksBuilder_ == null) {
         ensureChildLinksIsMutable();
         childLinks_.add(index, builderForValue.build());
@@ -3739,7 +3803,8 @@ public Builder addChildLinks(int index, ChildLink.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public Builder addAllChildLinks(Iterable values) {
+    public Builder addAllChildLinks(
+        java.lang.Iterable values) {
       if (childLinksBuilder_ == null) {
         ensureChildLinksIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, childLinks_);
@@ -3796,7 +3861,7 @@ public Builder removeChildLinks(int index) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public ChildLink.Builder getChildLinksBuilder(int index) {
+    public com.google.spanner.v1.PlanNode.ChildLink.Builder getChildLinksBuilder(int index) {
       return getChildLinksFieldBuilder().getBuilder(index);
     }
     /**
@@ -3808,7 +3873,7 @@ public ChildLink.Builder getChildLinksBuilder(int index) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public ChildLinkOrBuilder getChildLinksOrBuilder(int index) {
+    public com.google.spanner.v1.PlanNode.ChildLinkOrBuilder getChildLinksOrBuilder(int index) {
       if (childLinksBuilder_ == null) {
         return childLinks_.get(index);
       } else {
@@ -3824,7 +3889,8 @@ public ChildLinkOrBuilder getChildLinksOrBuilder(int index) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public java.util.List getChildLinksOrBuilderList() {
+    public java.util.List
+        getChildLinksOrBuilderList() {
       if (childLinksBuilder_ != null) {
         return childLinksBuilder_.getMessageOrBuilderList();
       } else {
@@ -3840,8 +3906,9 @@ public java.util.List getChildLinksOrBuilderList()
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public ChildLink.Builder addChildLinksBuilder() {
-      return getChildLinksFieldBuilder().addBuilder(ChildLink.getDefaultInstance());
+    public com.google.spanner.v1.PlanNode.ChildLink.Builder addChildLinksBuilder() {
+      return getChildLinksFieldBuilder()
+          .addBuilder(com.google.spanner.v1.PlanNode.ChildLink.getDefaultInstance());
     }
     /**
      *
@@ -3852,8 +3919,9 @@ public ChildLink.Builder addChildLinksBuilder() {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public ChildLink.Builder addChildLinksBuilder(int index) {
-      return getChildLinksFieldBuilder().addBuilder(index, ChildLink.getDefaultInstance());
+    public com.google.spanner.v1.PlanNode.ChildLink.Builder addChildLinksBuilder(int index) {
+      return getChildLinksFieldBuilder()
+          .addBuilder(index, com.google.spanner.v1.PlanNode.ChildLink.getDefaultInstance());
     }
     /**
      *
@@ -3864,26 +3932,33 @@ public ChildLink.Builder addChildLinksBuilder(int index) {
      *
      * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
      */
-    public java.util.List getChildLinksBuilderList() {
+    public java.util.List
+        getChildLinksBuilderList() {
       return getChildLinksFieldBuilder().getBuilderList();
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            ChildLink, ChildLink.Builder, ChildLinkOrBuilder>
+            com.google.spanner.v1.PlanNode.ChildLink,
+            com.google.spanner.v1.PlanNode.ChildLink.Builder,
+            com.google.spanner.v1.PlanNode.ChildLinkOrBuilder>
         getChildLinksFieldBuilder() {
       if (childLinksBuilder_ == null) {
         childLinksBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
-                ChildLink, ChildLink.Builder, ChildLinkOrBuilder>(
+                com.google.spanner.v1.PlanNode.ChildLink,
+                com.google.spanner.v1.PlanNode.ChildLink.Builder,
+                com.google.spanner.v1.PlanNode.ChildLinkOrBuilder>(
                 childLinks_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         childLinks_ = null;
       }
       return childLinksBuilder_;
     }
 
-    private ShortRepresentation shortRepresentation_;
+    private com.google.spanner.v1.PlanNode.ShortRepresentation shortRepresentation_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            ShortRepresentation, ShortRepresentation.Builder, ShortRepresentationOrBuilder>
+            com.google.spanner.v1.PlanNode.ShortRepresentation,
+            com.google.spanner.v1.PlanNode.ShortRepresentation.Builder,
+            com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder>
         shortRepresentationBuilder_;
     /**
      *
@@ -3910,10 +3985,10 @@ public boolean hasShortRepresentation() {
      *
      * @return The shortRepresentation.
      */
-    public ShortRepresentation getShortRepresentation() {
+    public com.google.spanner.v1.PlanNode.ShortRepresentation getShortRepresentation() {
       if (shortRepresentationBuilder_ == null) {
         return shortRepresentation_ == null
-            ? ShortRepresentation.getDefaultInstance()
+            ? com.google.spanner.v1.PlanNode.ShortRepresentation.getDefaultInstance()
             : shortRepresentation_;
       } else {
         return shortRepresentationBuilder_.getMessage();
@@ -3928,7 +4003,8 @@ public ShortRepresentation getShortRepresentation() {
      *
      * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
      */
-    public Builder setShortRepresentation(ShortRepresentation value) {
+    public Builder setShortRepresentation(
+        com.google.spanner.v1.PlanNode.ShortRepresentation value) {
       if (shortRepresentationBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -3950,7 +4026,8 @@ public Builder setShortRepresentation(ShortRepresentation value) {
      *
      * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
      */
-    public Builder setShortRepresentation(ShortRepresentation.Builder builderForValue) {
+    public Builder setShortRepresentation(
+        com.google.spanner.v1.PlanNode.ShortRepresentation.Builder builderForValue) {
       if (shortRepresentationBuilder_ == null) {
         shortRepresentation_ = builderForValue.build();
         onChanged();
@@ -3969,11 +4046,14 @@ public Builder setShortRepresentation(ShortRepresentation.Builder builderForValu
      *
      * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
      */
-    public Builder mergeShortRepresentation(ShortRepresentation value) {
+    public Builder mergeShortRepresentation(
+        com.google.spanner.v1.PlanNode.ShortRepresentation value) {
       if (shortRepresentationBuilder_ == null) {
         if (shortRepresentation_ != null) {
           shortRepresentation_ =
-              ShortRepresentation.newBuilder(shortRepresentation_).mergeFrom(value).buildPartial();
+              com.google.spanner.v1.PlanNode.ShortRepresentation.newBuilder(shortRepresentation_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           shortRepresentation_ = value;
         }
@@ -4013,7 +4093,8 @@ public Builder clearShortRepresentation() {
      *
      * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
      */
-    public ShortRepresentation.Builder getShortRepresentationBuilder() {
+    public com.google.spanner.v1.PlanNode.ShortRepresentation.Builder
+        getShortRepresentationBuilder() {
 
       onChanged();
       return getShortRepresentationFieldBuilder().getBuilder();
@@ -4027,12 +4108,13 @@ public ShortRepresentation.Builder getShortRepresentationBuilder() {
      *
      * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
      */
-    public ShortRepresentationOrBuilder getShortRepresentationOrBuilder() {
+    public com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder
+        getShortRepresentationOrBuilder() {
       if (shortRepresentationBuilder_ != null) {
         return shortRepresentationBuilder_.getMessageOrBuilder();
       } else {
         return shortRepresentation_ == null
-            ? ShortRepresentation.getDefaultInstance()
+            ? com.google.spanner.v1.PlanNode.ShortRepresentation.getDefaultInstance()
             : shortRepresentation_;
       }
     }
@@ -4046,12 +4128,16 @@ public ShortRepresentationOrBuilder getShortRepresentationOrBuilder() {
      * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            ShortRepresentation, ShortRepresentation.Builder, ShortRepresentationOrBuilder>
+            com.google.spanner.v1.PlanNode.ShortRepresentation,
+            com.google.spanner.v1.PlanNode.ShortRepresentation.Builder,
+            com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder>
         getShortRepresentationFieldBuilder() {
       if (shortRepresentationBuilder_ == null) {
         shortRepresentationBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                ShortRepresentation, ShortRepresentation.Builder, ShortRepresentationOrBuilder>(
+                com.google.spanner.v1.PlanNode.ShortRepresentation,
+                com.google.spanner.v1.PlanNode.ShortRepresentation.Builder,
+                com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder>(
                 getShortRepresentation(), getParentForChildren(), isClean());
         shortRepresentation_ = null;
       }
@@ -4503,12 +4589,12 @@ public com.google.protobuf.StructOrBuilder getExecutionStatsOrBuilder() {
       return executionStatsBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4518,19 +4604,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.PlanNode)
-  private static final PlanNode DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.PlanNode DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new PlanNode();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.PlanNode();
   }
 
-  public static PlanNode getDefaultInstance() {
+  public static com.google.spanner.v1.PlanNode getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public PlanNode parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4543,13 +4629,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public PlanNode getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.PlanNode getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNodeOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNodeOrBuilder.java
index 1445315af6..fa57b333d5 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNodeOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNodeOrBuilder.java
@@ -67,7 +67,7 @@ public interface PlanNodeOrBuilder
    *
    * @return The kind.
    */
-  PlanNode.Kind getKind();
+  com.google.spanner.v1.PlanNode.Kind getKind();
 
   /**
    *
@@ -80,7 +80,7 @@ public interface PlanNodeOrBuilder
    *
    * @return The displayName.
    */
-  String getDisplayName();
+  java.lang.String getDisplayName();
   /**
    *
    *
@@ -103,7 +103,7 @@ public interface PlanNodeOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  java.util.List getChildLinksList();
+  java.util.List getChildLinksList();
   /**
    *
    *
@@ -113,7 +113,7 @@ public interface PlanNodeOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  PlanNode.ChildLink getChildLinks(int index);
+  com.google.spanner.v1.PlanNode.ChildLink getChildLinks(int index);
   /**
    *
    *
@@ -133,7 +133,8 @@ public interface PlanNodeOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  java.util.List getChildLinksOrBuilderList();
+  java.util.List
+      getChildLinksOrBuilderList();
   /**
    *
    *
@@ -143,7 +144,7 @@ public interface PlanNodeOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode.ChildLink child_links = 4;
    */
-  PlanNode.ChildLinkOrBuilder getChildLinksOrBuilder(int index);
+  com.google.spanner.v1.PlanNode.ChildLinkOrBuilder getChildLinksOrBuilder(int index);
 
   /**
    *
@@ -168,7 +169,7 @@ public interface PlanNodeOrBuilder
    *
    * @return The shortRepresentation.
    */
-  PlanNode.ShortRepresentation getShortRepresentation();
+  com.google.spanner.v1.PlanNode.ShortRepresentation getShortRepresentation();
   /**
    *
    *
@@ -178,7 +179,7 @@ public interface PlanNodeOrBuilder
    *
    * .google.spanner.v1.PlanNode.ShortRepresentation short_representation = 5;
    */
-  PlanNode.ShortRepresentationOrBuilder getShortRepresentationOrBuilder();
+  com.google.spanner.v1.PlanNode.ShortRepresentationOrBuilder getShortRepresentationOrBuilder();
 
   /**
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java
index 67b23fb70e..d00d511db2 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java
@@ -41,13 +41,13 @@ private QueryPlan() {
     planNodes_ = java.util.Collections.emptyList();
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new QueryPlan();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private QueryPlan(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -74,10 +74,11 @@ private QueryPlan(
           case 10:
             {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                planNodes_ = new java.util.ArrayList();
+                planNodes_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              planNodes_.add(input.readMessage(PlanNode.parser(), extensionRegistry));
+              planNodes_.add(
+                  input.readMessage(com.google.spanner.v1.PlanNode.parser(), extensionRegistry));
               break;
             }
           default:
@@ -103,17 +104,21 @@ private QueryPlan(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_descriptor;
+    return com.google.spanner.v1.QueryPlanProto
+        .internal_static_google_spanner_v1_QueryPlan_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(QueryPlan.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.QueryPlanProto
+        .internal_static_google_spanner_v1_QueryPlan_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.QueryPlan.class, com.google.spanner.v1.QueryPlan.Builder.class);
   }
 
   public static final int PLAN_NODES_FIELD_NUMBER = 1;
-  private java.util.List planNodes_;
+  private java.util.List planNodes_;
   /**
    *
    *
@@ -125,8 +130,8 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  @Override
-  public java.util.List getPlanNodesList() {
+  @java.lang.Override
+  public java.util.List getPlanNodesList() {
     return planNodes_;
   }
   /**
@@ -140,8 +145,9 @@ public java.util.List getPlanNodesList() {
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  @Override
-  public java.util.List getPlanNodesOrBuilderList() {
+  @java.lang.Override
+  public java.util.List
+      getPlanNodesOrBuilderList() {
     return planNodes_;
   }
   /**
@@ -155,7 +161,7 @@ public java.util.List getPlanNodesOrBuilderList() {
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  @Override
+  @java.lang.Override
   public int getPlanNodesCount() {
     return planNodes_.size();
   }
@@ -170,8 +176,8 @@ public int getPlanNodesCount() {
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  @Override
-  public PlanNode getPlanNodes(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.PlanNode getPlanNodes(int index) {
     return planNodes_.get(index);
   }
   /**
@@ -185,14 +191,14 @@ public PlanNode getPlanNodes(int index) {
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  @Override
-  public PlanNodeOrBuilder getPlanNodesOrBuilder(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.PlanNodeOrBuilder getPlanNodesOrBuilder(int index) {
     return planNodes_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -202,7 +208,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     for (int i = 0; i < planNodes_.size(); i++) {
       output.writeMessage(1, planNodes_.get(i));
@@ -210,7 +216,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -224,22 +230,22 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof QueryPlan)) {
+    if (!(obj instanceof com.google.spanner.v1.QueryPlan)) {
       return super.equals(obj);
     }
-    QueryPlan other = (QueryPlan) obj;
+    com.google.spanner.v1.QueryPlan other = (com.google.spanner.v1.QueryPlan) obj;
 
     if (!getPlanNodesList().equals(other.getPlanNodesList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -255,68 +261,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static QueryPlan parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.QueryPlan parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static QueryPlan parseFrom(
+  public static com.google.spanner.v1.QueryPlan parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static QueryPlan parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.QueryPlan parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static QueryPlan parseFrom(
+  public static com.google.spanner.v1.QueryPlan parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static QueryPlan parseFrom(byte[] data)
+  public static com.google.spanner.v1.QueryPlan parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static QueryPlan parseFrom(
+  public static com.google.spanner.v1.QueryPlan parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static QueryPlan parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.QueryPlan parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static QueryPlan parseFrom(
+  public static com.google.spanner.v1.QueryPlan 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 QueryPlan parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.QueryPlan parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static QueryPlan parseDelimitedFrom(
+  public static com.google.spanner.v1.QueryPlan 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 QueryPlan parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.QueryPlan parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static QueryPlan parseFrom(
+  public static com.google.spanner.v1.QueryPlan parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -324,7 +332,7 @@ public static QueryPlan parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -333,17 +341,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(QueryPlan prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.QueryPlan prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -359,15 +367,19 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.QueryPlan)
-      QueryPlanOrBuilder {
+      com.google.spanner.v1.QueryPlanOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_descriptor;
+      return com.google.spanner.v1.QueryPlanProto
+          .internal_static_google_spanner_v1_QueryPlan_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(QueryPlan.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.QueryPlanProto
+          .internal_static_google_spanner_v1_QueryPlan_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.QueryPlan.class, com.google.spanner.v1.QueryPlan.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.QueryPlan.newBuilder()
@@ -375,7 +387,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -386,7 +398,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (planNodesBuilder_ == null) {
@@ -398,28 +410,29 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_descriptor;
+      return com.google.spanner.v1.QueryPlanProto
+          .internal_static_google_spanner_v1_QueryPlan_descriptor;
     }
 
-    @Override
-    public QueryPlan getDefaultInstanceForType() {
-      return QueryPlan.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.QueryPlan getDefaultInstanceForType() {
+      return com.google.spanner.v1.QueryPlan.getDefaultInstance();
     }
 
-    @Override
-    public QueryPlan build() {
-      QueryPlan result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.QueryPlan build() {
+      com.google.spanner.v1.QueryPlan result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public QueryPlan buildPartial() {
-      QueryPlan result = new QueryPlan(this);
+    @java.lang.Override
+    public com.google.spanner.v1.QueryPlan buildPartial() {
+      com.google.spanner.v1.QueryPlan result = new com.google.spanner.v1.QueryPlan(this);
       int from_bitField0_ = bitField0_;
       if (planNodesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -434,50 +447,51 @@ public QueryPlan buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof QueryPlan) {
-        return mergeFrom((QueryPlan) other);
+      if (other instanceof com.google.spanner.v1.QueryPlan) {
+        return mergeFrom((com.google.spanner.v1.QueryPlan) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(QueryPlan other) {
-      if (other == QueryPlan.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.QueryPlan other) {
+      if (other == com.google.spanner.v1.QueryPlan.getDefaultInstance()) return this;
       if (planNodesBuilder_ == null) {
         if (!other.planNodes_.isEmpty()) {
           if (planNodes_.isEmpty()) {
@@ -510,21 +524,21 @@ public Builder mergeFrom(QueryPlan other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      QueryPlan parsedMessage = null;
+      com.google.spanner.v1.QueryPlan parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (QueryPlan) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.QueryPlan) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -536,17 +550,20 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.util.List planNodes_ = java.util.Collections.emptyList();
+    private java.util.List planNodes_ =
+        java.util.Collections.emptyList();
 
     private void ensurePlanNodesIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        planNodes_ = new java.util.ArrayList(planNodes_);
+        planNodes_ = new java.util.ArrayList(planNodes_);
         bitField0_ |= 0x00000001;
       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            PlanNode, PlanNode.Builder, PlanNodeOrBuilder>
+            com.google.spanner.v1.PlanNode,
+            com.google.spanner.v1.PlanNode.Builder,
+            com.google.spanner.v1.PlanNodeOrBuilder>
         planNodesBuilder_;
 
     /**
@@ -560,7 +577,7 @@ private void ensurePlanNodesIsMutable() {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public java.util.List getPlanNodesList() {
+    public java.util.List getPlanNodesList() {
       if (planNodesBuilder_ == null) {
         return java.util.Collections.unmodifiableList(planNodes_);
       } else {
@@ -596,7 +613,7 @@ public int getPlanNodesCount() {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public PlanNode getPlanNodes(int index) {
+    public com.google.spanner.v1.PlanNode getPlanNodes(int index) {
       if (planNodesBuilder_ == null) {
         return planNodes_.get(index);
       } else {
@@ -614,7 +631,7 @@ public PlanNode getPlanNodes(int index) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder setPlanNodes(int index, PlanNode value) {
+    public Builder setPlanNodes(int index, com.google.spanner.v1.PlanNode value) {
       if (planNodesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -638,7 +655,7 @@ public Builder setPlanNodes(int index, PlanNode value) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder setPlanNodes(int index, PlanNode.Builder builderForValue) {
+    public Builder setPlanNodes(int index, com.google.spanner.v1.PlanNode.Builder builderForValue) {
       if (planNodesBuilder_ == null) {
         ensurePlanNodesIsMutable();
         planNodes_.set(index, builderForValue.build());
@@ -659,7 +676,7 @@ public Builder setPlanNodes(int index, PlanNode.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder addPlanNodes(PlanNode value) {
+    public Builder addPlanNodes(com.google.spanner.v1.PlanNode value) {
       if (planNodesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -683,7 +700,7 @@ public Builder addPlanNodes(PlanNode value) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder addPlanNodes(int index, PlanNode value) {
+    public Builder addPlanNodes(int index, com.google.spanner.v1.PlanNode value) {
       if (planNodesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -707,7 +724,7 @@ public Builder addPlanNodes(int index, PlanNode value) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder addPlanNodes(PlanNode.Builder builderForValue) {
+    public Builder addPlanNodes(com.google.spanner.v1.PlanNode.Builder builderForValue) {
       if (planNodesBuilder_ == null) {
         ensurePlanNodesIsMutable();
         planNodes_.add(builderForValue.build());
@@ -728,7 +745,7 @@ public Builder addPlanNodes(PlanNode.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder addPlanNodes(int index, PlanNode.Builder builderForValue) {
+    public Builder addPlanNodes(int index, com.google.spanner.v1.PlanNode.Builder builderForValue) {
       if (planNodesBuilder_ == null) {
         ensurePlanNodesIsMutable();
         planNodes_.add(index, builderForValue.build());
@@ -749,7 +766,8 @@ public Builder addPlanNodes(int index, PlanNode.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public Builder addAllPlanNodes(Iterable values) {
+    public Builder addAllPlanNodes(
+        java.lang.Iterable values) {
       if (planNodesBuilder_ == null) {
         ensurePlanNodesIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, planNodes_);
@@ -812,7 +830,7 @@ public Builder removePlanNodes(int index) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public PlanNode.Builder getPlanNodesBuilder(int index) {
+    public com.google.spanner.v1.PlanNode.Builder getPlanNodesBuilder(int index) {
       return getPlanNodesFieldBuilder().getBuilder(index);
     }
     /**
@@ -826,7 +844,7 @@ public PlanNode.Builder getPlanNodesBuilder(int index) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public PlanNodeOrBuilder getPlanNodesOrBuilder(int index) {
+    public com.google.spanner.v1.PlanNodeOrBuilder getPlanNodesOrBuilder(int index) {
       if (planNodesBuilder_ == null) {
         return planNodes_.get(index);
       } else {
@@ -844,7 +862,8 @@ public PlanNodeOrBuilder getPlanNodesOrBuilder(int index) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public java.util.List getPlanNodesOrBuilderList() {
+    public java.util.List
+        getPlanNodesOrBuilderList() {
       if (planNodesBuilder_ != null) {
         return planNodesBuilder_.getMessageOrBuilderList();
       } else {
@@ -862,8 +881,9 @@ public java.util.List getPlanNodesOrBuilderList() {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public PlanNode.Builder addPlanNodesBuilder() {
-      return getPlanNodesFieldBuilder().addBuilder(PlanNode.getDefaultInstance());
+    public com.google.spanner.v1.PlanNode.Builder addPlanNodesBuilder() {
+      return getPlanNodesFieldBuilder()
+          .addBuilder(com.google.spanner.v1.PlanNode.getDefaultInstance());
     }
     /**
      *
@@ -876,8 +896,9 @@ public PlanNode.Builder addPlanNodesBuilder() {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public PlanNode.Builder addPlanNodesBuilder(int index) {
-      return getPlanNodesFieldBuilder().addBuilder(index, PlanNode.getDefaultInstance());
+    public com.google.spanner.v1.PlanNode.Builder addPlanNodesBuilder(int index) {
+      return getPlanNodesFieldBuilder()
+          .addBuilder(index, com.google.spanner.v1.PlanNode.getDefaultInstance());
     }
     /**
      *
@@ -890,29 +911,33 @@ public PlanNode.Builder addPlanNodesBuilder(int index) {
      *
      * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
      */
-    public java.util.List getPlanNodesBuilderList() {
+    public java.util.List getPlanNodesBuilderList() {
       return getPlanNodesFieldBuilder().getBuilderList();
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            PlanNode, PlanNode.Builder, PlanNodeOrBuilder>
+            com.google.spanner.v1.PlanNode,
+            com.google.spanner.v1.PlanNode.Builder,
+            com.google.spanner.v1.PlanNodeOrBuilder>
         getPlanNodesFieldBuilder() {
       if (planNodesBuilder_ == null) {
         planNodesBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
-                PlanNode, PlanNode.Builder, PlanNodeOrBuilder>(
+                com.google.spanner.v1.PlanNode,
+                com.google.spanner.v1.PlanNode.Builder,
+                com.google.spanner.v1.PlanNodeOrBuilder>(
                 planNodes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         planNodes_ = null;
       }
       return planNodesBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -922,19 +947,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.QueryPlan)
-  private static final QueryPlan DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.QueryPlan DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new QueryPlan();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.QueryPlan();
   }
 
-  public static QueryPlan getDefaultInstance() {
+  public static com.google.spanner.v1.QueryPlan getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public QueryPlan parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -947,13 +972,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public QueryPlan getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.QueryPlan getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanOrBuilder.java
index cd271bc738..2c570c1e9e 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanOrBuilder.java
@@ -34,7 +34,7 @@ public interface QueryPlanOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  java.util.List getPlanNodesList();
+  java.util.List getPlanNodesList();
   /**
    *
    *
@@ -46,7 +46,7 @@ public interface QueryPlanOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  PlanNode getPlanNodes(int index);
+  com.google.spanner.v1.PlanNode getPlanNodes(int index);
   /**
    *
    *
@@ -70,7 +70,7 @@ public interface QueryPlanOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  java.util.List getPlanNodesOrBuilderList();
+  java.util.List getPlanNodesOrBuilderList();
   /**
    *
    *
@@ -82,5 +82,5 @@ public interface QueryPlanOrBuilder
    *
    * repeated .google.spanner.v1.PlanNode plan_nodes = 1;
    */
-  PlanNodeOrBuilder getPlanNodesOrBuilder(int index);
+  com.google.spanner.v1.PlanNodeOrBuilder getPlanNodesOrBuilder(int index);
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java
index 16d91062b0..03c05431d0 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java
@@ -55,7 +55,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
   static {
-    String[] descriptorData = {
+    java.lang.String[] descriptorData = {
       "\n\"google/spanner/v1/query_plan.proto\022\021go"
           + "ogle.spanner.v1\032\034google/protobuf/struct."
           + "proto\032\034google/api/annotations.proto\"\370\004\n\010"
@@ -95,7 +95,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_PlanNode_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_PlanNode_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Index",
               "Kind",
               "DisplayName",
@@ -109,7 +109,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_PlanNode_ChildLink_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "ChildIndex", "Type", "Variable",
             });
     internal_static_google_spanner_v1_PlanNode_ShortRepresentation_descriptor =
@@ -117,7 +117,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_PlanNode_ShortRepresentation_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_PlanNode_ShortRepresentation_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Description", "Subqueries",
             });
     internal_static_google_spanner_v1_PlanNode_ShortRepresentation_SubqueriesEntry_descriptor =
@@ -127,7 +127,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_PlanNode_ShortRepresentation_SubqueriesEntry_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_PlanNode_ShortRepresentation_SubqueriesEntry_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Key", "Value",
             });
     internal_static_google_spanner_v1_QueryPlan_descriptor =
@@ -135,7 +135,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_QueryPlan_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_QueryPlan_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "PlanNodes",
             });
     com.google.protobuf.StructProto.getDescriptor();
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java
index 2b95b01b66..38dd755615 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java
@@ -78,104 +78,104 @@ private ReadRequest(
             done = true;
             break;
           case 10:
-          {
-            java.lang.String s = input.readStringRequireUtf8();
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            session_ = s;
-            break;
-          }
-          case 18:
-          {
-            com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
-            if (transaction_ != null) {
-              subBuilder = transaction_.toBuilder();
+              session_ = s;
+              break;
             }
-            transaction_ =
-                input.readMessage(
-                    com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(transaction_);
-              transaction_ = subBuilder.buildPartial();
+          case 18:
+            {
+              com.google.spanner.v1.TransactionSelector.Builder subBuilder = null;
+              if (transaction_ != null) {
+                subBuilder = transaction_.toBuilder();
+              }
+              transaction_ =
+                  input.readMessage(
+                      com.google.spanner.v1.TransactionSelector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(transaction_);
+                transaction_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-
-            break;
-          }
           case 26:
-          {
-            java.lang.String s = input.readStringRequireUtf8();
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            table_ = s;
-            break;
-          }
+              table_ = s;
+              break;
+            }
           case 34:
-          {
-            java.lang.String s = input.readStringRequireUtf8();
+            {
+              java.lang.String s = input.readStringRequireUtf8();
 
-            index_ = s;
-            break;
-          }
+              index_ = s;
+              break;
+            }
           case 42:
-          {
-            java.lang.String s = input.readStringRequireUtf8();
-            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-              columns_ = new com.google.protobuf.LazyStringArrayList();
-              mutable_bitField0_ |= 0x00000001;
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                columns_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              columns_.add(s);
+              break;
             }
-            columns_.add(s);
-            break;
-          }
           case 50:
-          {
-            com.google.spanner.v1.KeySet.Builder subBuilder = null;
-            if (keySet_ != null) {
-              subBuilder = keySet_.toBuilder();
-            }
-            keySet_ = input.readMessage(com.google.spanner.v1.KeySet.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(keySet_);
-              keySet_ = subBuilder.buildPartial();
+            {
+              com.google.spanner.v1.KeySet.Builder subBuilder = null;
+              if (keySet_ != null) {
+                subBuilder = keySet_.toBuilder();
+              }
+              keySet_ = input.readMessage(com.google.spanner.v1.KeySet.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(keySet_);
+                keySet_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-
-            break;
-          }
           case 64:
-          {
-            limit_ = input.readInt64();
-            break;
-          }
+            {
+              limit_ = input.readInt64();
+              break;
+            }
           case 74:
-          {
-            resumeToken_ = input.readBytes();
-            break;
-          }
+            {
+              resumeToken_ = input.readBytes();
+              break;
+            }
           case 82:
-          {
-            partitionToken_ = input.readBytes();
-            break;
-          }
-          case 90:
-          {
-            com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
-            if (requestOptions_ != null) {
-              subBuilder = requestOptions_.toBuilder();
+            {
+              partitionToken_ = input.readBytes();
+              break;
             }
-            requestOptions_ =
-                input.readMessage(
-                    com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(requestOptions_);
-              requestOptions_ = subBuilder.buildPartial();
+          case 90:
+            {
+              com.google.spanner.v1.RequestOptions.Builder subBuilder = null;
+              if (requestOptions_ != null) {
+                subBuilder = requestOptions_.toBuilder();
+              }
+              requestOptions_ =
+                  input.readMessage(
+                      com.google.spanner.v1.RequestOptions.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(requestOptions_);
+                requestOptions_ = subBuilder.buildPartial();
+              }
+
+              break;
             }
-
-            break;
-          }
           default:
-          {
-            if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-              done = true;
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
             }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -198,7 +198,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-  internalGetFieldAccessorTable() {
+      internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto
         .internal_static_google_spanner_v1_ReadRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
@@ -943,7 +943,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internalGetFieldAccessorTable() {
+        internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_ReadRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -1291,9 +1291,9 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
 
     private com.google.spanner.v1.TransactionSelector transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.TransactionSelector,
-        com.google.spanner.v1.TransactionSelector.Builder,
-        com.google.spanner.v1.TransactionSelectorOrBuilder>
+            com.google.spanner.v1.TransactionSelector,
+            com.google.spanner.v1.TransactionSelector.Builder,
+            com.google.spanner.v1.TransactionSelectorOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -1468,10 +1468,10 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde
      * .google.spanner.v1.TransactionSelector transaction = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.TransactionSelector,
-        com.google.spanner.v1.TransactionSelector.Builder,
-        com.google.spanner.v1.TransactionSelectorOrBuilder>
-    getTransactionFieldBuilder() {
+            com.google.spanner.v1.TransactionSelector,
+            com.google.spanner.v1.TransactionSelector.Builder,
+            com.google.spanner.v1.TransactionSelectorOrBuilder>
+        getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -1885,9 +1885,9 @@ public Builder addColumnsBytes(com.google.protobuf.ByteString value) {
 
     private com.google.spanner.v1.KeySet keySet_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.KeySet,
-        com.google.spanner.v1.KeySet.Builder,
-        com.google.spanner.v1.KeySetOrBuilder>
+            com.google.spanner.v1.KeySet,
+            com.google.spanner.v1.KeySet.Builder,
+            com.google.spanner.v1.KeySetOrBuilder>
         keySetBuilder_;
     /**
      *
@@ -2127,10 +2127,10 @@ public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
      * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.KeySet,
-        com.google.spanner.v1.KeySet.Builder,
-        com.google.spanner.v1.KeySetOrBuilder>
-    getKeySetFieldBuilder() {
+            com.google.spanner.v1.KeySet,
+            com.google.spanner.v1.KeySet.Builder,
+            com.google.spanner.v1.KeySetOrBuilder>
+        getKeySetFieldBuilder() {
       if (keySetBuilder_ == null) {
         keySetBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -2337,9 +2337,9 @@ public Builder clearPartitionToken() {
 
     private com.google.spanner.v1.RequestOptions requestOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.RequestOptions,
-        com.google.spanner.v1.RequestOptions.Builder,
-        com.google.spanner.v1.RequestOptionsOrBuilder>
+            com.google.spanner.v1.RequestOptions,
+            com.google.spanner.v1.RequestOptions.Builder,
+            com.google.spanner.v1.RequestOptionsOrBuilder>
         requestOptionsBuilder_;
     /**
      *
@@ -2504,10 +2504,10 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder(
      * .google.spanner.v1.RequestOptions request_options = 11;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.spanner.v1.RequestOptions,
-        com.google.spanner.v1.RequestOptions.Builder,
-        com.google.spanner.v1.RequestOptionsOrBuilder>
-    getRequestOptionsFieldBuilder() {
+            com.google.spanner.v1.RequestOptions,
+            com.google.spanner.v1.RequestOptions.Builder,
+            com.google.spanner.v1.RequestOptionsOrBuilder>
+        getRequestOptionsFieldBuilder() {
       if (requestOptionsBuilder_ == null) {
         requestOptionsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
@@ -2569,4 +2569,4 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.spanner.v1.ReadRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
-}
\ No newline at end of file
+}
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequestOrBuilder.java
index 132eec65ac..5988afde18 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface ReadRequestOrBuilder
    *
    * @return The session.
    */
-  String getSession();
+  java.lang.String getSession();
   /**
    *
    *
@@ -77,7 +77,7 @@ public interface ReadRequestOrBuilder
    *
    * @return The transaction.
    */
-  TransactionSelector getTransaction();
+  com.google.spanner.v1.TransactionSelector getTransaction();
   /**
    *
    *
@@ -88,7 +88,7 @@ public interface ReadRequestOrBuilder
    *
    * .google.spanner.v1.TransactionSelector transaction = 2;
    */
-  TransactionSelectorOrBuilder getTransactionOrBuilder();
+  com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilder();
 
   /**
    *
@@ -101,7 +101,7 @@ public interface ReadRequestOrBuilder
    *
    * @return The table.
    */
-  String getTable();
+  java.lang.String getTable();
   /**
    *
    *
@@ -128,7 +128,7 @@ public interface ReadRequestOrBuilder
    *
    * @return The index.
    */
-  String getIndex();
+  java.lang.String getIndex();
   /**
    *
    *
@@ -156,7 +156,7 @@ public interface ReadRequestOrBuilder
    *
    * @return A list containing the columns.
    */
-  java.util.List getColumnsList();
+  java.util.List getColumnsList();
   /**
    *
    *
@@ -183,7 +183,7 @@ public interface ReadRequestOrBuilder
    * @param index The index of the element to return.
    * @return The columns at the given index.
    */
-  String getColumns(int index);
+  java.lang.String getColumns(int index);
   /**
    *
    *
@@ -240,7 +240,7 @@ public interface ReadRequestOrBuilder
    *
    * @return The keySet.
    */
-  KeySet getKeySet();
+  com.google.spanner.v1.KeySet getKeySet();
   /**
    *
    *
@@ -259,7 +259,7 @@ public interface ReadRequestOrBuilder
    *
    * .google.spanner.v1.KeySet key_set = 6 [(.google.api.field_behavior) = REQUIRED];
    */
-  KeySetOrBuilder getKeySetOrBuilder();
+  com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder();
 
   /**
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RequestOptions.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RequestOptions.java
index 51982b1b8f..6d0d1f7926 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RequestOptions.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RequestOptions.java
@@ -680,7 +680,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internalGetFieldAccessorTable() {
+        internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto
           .internal_static_google_spanner_v1_RequestOptions_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java
index e2ccd817af..18f72a29bd 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java
@@ -42,13 +42,13 @@ private ResultSet() {
     rows_ = java.util.Collections.emptyList();
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ResultSet();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private ResultSet(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -74,11 +74,13 @@ private ResultSet(
             break;
           case 10:
             {
-              ResultSetMetadata.Builder subBuilder = null;
+              com.google.spanner.v1.ResultSetMetadata.Builder subBuilder = null;
               if (metadata_ != null) {
                 subBuilder = metadata_.toBuilder();
               }
-              metadata_ = input.readMessage(ResultSetMetadata.parser(), extensionRegistry);
+              metadata_ =
+                  input.readMessage(
+                      com.google.spanner.v1.ResultSetMetadata.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(metadata_);
                 metadata_ = subBuilder.buildPartial();
@@ -98,11 +100,13 @@ private ResultSet(
             }
           case 26:
             {
-              ResultSetStats.Builder subBuilder = null;
+              com.google.spanner.v1.ResultSetStats.Builder subBuilder = null;
               if (stats_ != null) {
                 subBuilder = stats_.toBuilder();
               }
-              stats_ = input.readMessage(ResultSetStats.parser(), extensionRegistry);
+              stats_ =
+                  input.readMessage(
+                      com.google.spanner.v1.ResultSetStats.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(stats_);
                 stats_ = subBuilder.buildPartial();
@@ -133,17 +137,21 @@ private ResultSet(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return ResultSetProto.internal_static_google_spanner_v1_ResultSet_descriptor;
+    return com.google.spanner.v1.ResultSetProto
+        .internal_static_google_spanner_v1_ResultSet_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return ResultSetProto.internal_static_google_spanner_v1_ResultSet_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(ResultSet.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.ResultSetProto
+        .internal_static_google_spanner_v1_ResultSet_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.ResultSet.class, com.google.spanner.v1.ResultSet.Builder.class);
   }
 
   public static final int METADATA_FIELD_NUMBER = 1;
-  private ResultSetMetadata metadata_;
+  private com.google.spanner.v1.ResultSetMetadata metadata_;
   /**
    *
    *
@@ -155,7 +163,7 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return Whether the metadata field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasMetadata() {
     return metadata_ != null;
   }
@@ -170,9 +178,11 @@ public boolean hasMetadata() {
    *
    * @return The metadata.
    */
-  @Override
-  public ResultSetMetadata getMetadata() {
-    return metadata_ == null ? ResultSetMetadata.getDefaultInstance() : metadata_;
+  @java.lang.Override
+  public com.google.spanner.v1.ResultSetMetadata getMetadata() {
+    return metadata_ == null
+        ? com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()
+        : metadata_;
   }
   /**
    *
@@ -183,8 +193,8 @@ public ResultSetMetadata getMetadata() {
    *
    * .google.spanner.v1.ResultSetMetadata metadata = 1;
    */
-  @Override
-  public ResultSetMetadataOrBuilder getMetadataOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() {
     return getMetadata();
   }
 
@@ -204,7 +214,7 @@ public ResultSetMetadataOrBuilder getMetadataOrBuilder() {
    *
    * repeated .google.protobuf.ListValue rows = 2;
    */
-  @Override
+  @java.lang.Override
   public java.util.List getRowsList() {
     return rows_;
   }
@@ -222,7 +232,7 @@ public java.util.List getRowsList() {
    *
    * repeated .google.protobuf.ListValue rows = 2;
    */
-  @Override
+  @java.lang.Override
   public java.util.List getRowsOrBuilderList() {
     return rows_;
   }
@@ -240,7 +250,7 @@ public java.util.List getRowsO
    *
    * repeated .google.protobuf.ListValue rows = 2;
    */
-  @Override
+  @java.lang.Override
   public int getRowsCount() {
     return rows_.size();
   }
@@ -258,7 +268,7 @@ public int getRowsCount() {
    *
    * repeated .google.protobuf.ListValue rows = 2;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ListValue getRows(int index) {
     return rows_.get(index);
   }
@@ -276,13 +286,13 @@ public com.google.protobuf.ListValue getRows(int index) {
    *
    * repeated .google.protobuf.ListValue rows = 2;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ListValueOrBuilder getRowsOrBuilder(int index) {
     return rows_.get(index);
   }
 
   public static final int STATS_FIELD_NUMBER = 3;
-  private ResultSetStats stats_;
+  private com.google.spanner.v1.ResultSetStats stats_;
   /**
    *
    *
@@ -301,7 +311,7 @@ public com.google.protobuf.ListValueOrBuilder getRowsOrBuilder(int index) {
    *
    * @return Whether the stats field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasStats() {
     return stats_ != null;
   }
@@ -323,9 +333,9 @@ public boolean hasStats() {
    *
    * @return The stats.
    */
-  @Override
-  public ResultSetStats getStats() {
-    return stats_ == null ? ResultSetStats.getDefaultInstance() : stats_;
+  @java.lang.Override
+  public com.google.spanner.v1.ResultSetStats getStats() {
+    return stats_ == null ? com.google.spanner.v1.ResultSetStats.getDefaultInstance() : stats_;
   }
   /**
    *
@@ -343,14 +353,14 @@ public ResultSetStats getStats() {
    *
    * .google.spanner.v1.ResultSetStats stats = 3;
    */
-  @Override
-  public ResultSetStatsOrBuilder getStatsOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
     return getStats();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -360,7 +370,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (metadata_ != null) {
       output.writeMessage(1, getMetadata());
@@ -374,7 +384,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -394,15 +404,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof ResultSet)) {
+    if (!(obj instanceof com.google.spanner.v1.ResultSet)) {
       return super.equals(obj);
     }
-    ResultSet other = (ResultSet) obj;
+    com.google.spanner.v1.ResultSet other = (com.google.spanner.v1.ResultSet) obj;
 
     if (hasMetadata() != other.hasMetadata()) return false;
     if (hasMetadata()) {
@@ -417,7 +427,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -441,68 +451,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static ResultSet parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.ResultSet parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ResultSet parseFrom(
+  public static com.google.spanner.v1.ResultSet parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ResultSet parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.ResultSet parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ResultSet parseFrom(
+  public static com.google.spanner.v1.ResultSet parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ResultSet parseFrom(byte[] data)
+  public static com.google.spanner.v1.ResultSet parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ResultSet parseFrom(
+  public static com.google.spanner.v1.ResultSet parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ResultSet parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.ResultSet parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static ResultSet parseFrom(
+  public static com.google.spanner.v1.ResultSet 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 ResultSet parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.ResultSet parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static ResultSet parseDelimitedFrom(
+  public static com.google.spanner.v1.ResultSet 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 ResultSet parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.ResultSet parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static ResultSet parseFrom(
+  public static com.google.spanner.v1.ResultSet parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -510,7 +522,7 @@ public static ResultSet parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -519,17 +531,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(ResultSet prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.ResultSet prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -546,15 +558,19 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.ResultSet)
-      ResultSetOrBuilder {
+      com.google.spanner.v1.ResultSetOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return ResultSetProto.internal_static_google_spanner_v1_ResultSet_descriptor;
+      return com.google.spanner.v1.ResultSetProto
+          .internal_static_google_spanner_v1_ResultSet_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return ResultSetProto.internal_static_google_spanner_v1_ResultSet_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(ResultSet.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.ResultSetProto
+          .internal_static_google_spanner_v1_ResultSet_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.ResultSet.class, com.google.spanner.v1.ResultSet.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.ResultSet.newBuilder()
@@ -562,7 +578,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -573,7 +589,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (metadataBuilder_ == null) {
@@ -597,28 +613,29 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return ResultSetProto.internal_static_google_spanner_v1_ResultSet_descriptor;
+      return com.google.spanner.v1.ResultSetProto
+          .internal_static_google_spanner_v1_ResultSet_descriptor;
     }
 
-    @Override
-    public ResultSet getDefaultInstanceForType() {
-      return ResultSet.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.ResultSet getDefaultInstanceForType() {
+      return com.google.spanner.v1.ResultSet.getDefaultInstance();
     }
 
-    @Override
-    public ResultSet build() {
-      ResultSet result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.ResultSet build() {
+      com.google.spanner.v1.ResultSet result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public ResultSet buildPartial() {
-      ResultSet result = new ResultSet(this);
+    @java.lang.Override
+    public com.google.spanner.v1.ResultSet buildPartial() {
+      com.google.spanner.v1.ResultSet result = new com.google.spanner.v1.ResultSet(this);
       int from_bitField0_ = bitField0_;
       if (metadataBuilder_ == null) {
         result.metadata_ = metadata_;
@@ -643,50 +660,51 @@ public ResultSet buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof ResultSet) {
-        return mergeFrom((ResultSet) other);
+      if (other instanceof com.google.spanner.v1.ResultSet) {
+        return mergeFrom((com.google.spanner.v1.ResultSet) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(ResultSet other) {
-      if (other == ResultSet.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.ResultSet other) {
+      if (other == com.google.spanner.v1.ResultSet.getDefaultInstance()) return this;
       if (other.hasMetadata()) {
         mergeMetadata(other.getMetadata());
       }
@@ -725,21 +743,21 @@ public Builder mergeFrom(ResultSet other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      ResultSet parsedMessage = null;
+      com.google.spanner.v1.ResultSet parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (ResultSet) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.ResultSet) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -751,9 +769,11 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private ResultSetMetadata metadata_;
+    private com.google.spanner.v1.ResultSetMetadata metadata_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            ResultSetMetadata, ResultSetMetadata.Builder, ResultSetMetadataOrBuilder>
+            com.google.spanner.v1.ResultSetMetadata,
+            com.google.spanner.v1.ResultSetMetadata.Builder,
+            com.google.spanner.v1.ResultSetMetadataOrBuilder>
         metadataBuilder_;
     /**
      *
@@ -780,9 +800,11 @@ public boolean hasMetadata() {
      *
      * @return The metadata.
      */
-    public ResultSetMetadata getMetadata() {
+    public com.google.spanner.v1.ResultSetMetadata getMetadata() {
       if (metadataBuilder_ == null) {
-        return metadata_ == null ? ResultSetMetadata.getDefaultInstance() : metadata_;
+        return metadata_ == null
+            ? com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()
+            : metadata_;
       } else {
         return metadataBuilder_.getMessage();
       }
@@ -796,7 +818,7 @@ public ResultSetMetadata getMetadata() {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public Builder setMetadata(ResultSetMetadata value) {
+    public Builder setMetadata(com.google.spanner.v1.ResultSetMetadata value) {
       if (metadataBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -818,7 +840,7 @@ public Builder setMetadata(ResultSetMetadata value) {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public Builder setMetadata(ResultSetMetadata.Builder builderForValue) {
+    public Builder setMetadata(com.google.spanner.v1.ResultSetMetadata.Builder builderForValue) {
       if (metadataBuilder_ == null) {
         metadata_ = builderForValue.build();
         onChanged();
@@ -837,10 +859,13 @@ public Builder setMetadata(ResultSetMetadata.Builder builderForValue) {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public Builder mergeMetadata(ResultSetMetadata value) {
+    public Builder mergeMetadata(com.google.spanner.v1.ResultSetMetadata value) {
       if (metadataBuilder_ == null) {
         if (metadata_ != null) {
-          metadata_ = ResultSetMetadata.newBuilder(metadata_).mergeFrom(value).buildPartial();
+          metadata_ =
+              com.google.spanner.v1.ResultSetMetadata.newBuilder(metadata_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           metadata_ = value;
         }
@@ -880,7 +905,7 @@ public Builder clearMetadata() {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public ResultSetMetadata.Builder getMetadataBuilder() {
+    public com.google.spanner.v1.ResultSetMetadata.Builder getMetadataBuilder() {
 
       onChanged();
       return getMetadataFieldBuilder().getBuilder();
@@ -894,11 +919,13 @@ public ResultSetMetadata.Builder getMetadataBuilder() {
      *
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
-    public ResultSetMetadataOrBuilder getMetadataOrBuilder() {
+    public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() {
       if (metadataBuilder_ != null) {
         return metadataBuilder_.getMessageOrBuilder();
       } else {
-        return metadata_ == null ? ResultSetMetadata.getDefaultInstance() : metadata_;
+        return metadata_ == null
+            ? com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()
+            : metadata_;
       }
     }
     /**
@@ -911,12 +938,16 @@ public ResultSetMetadataOrBuilder getMetadataOrBuilder() {
      * .google.spanner.v1.ResultSetMetadata metadata = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            ResultSetMetadata, ResultSetMetadata.Builder, ResultSetMetadataOrBuilder>
+            com.google.spanner.v1.ResultSetMetadata,
+            com.google.spanner.v1.ResultSetMetadata.Builder,
+            com.google.spanner.v1.ResultSetMetadataOrBuilder>
         getMetadataFieldBuilder() {
       if (metadataBuilder_ == null) {
         metadataBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                ResultSetMetadata, ResultSetMetadata.Builder, ResultSetMetadataOrBuilder>(
+                com.google.spanner.v1.ResultSetMetadata,
+                com.google.spanner.v1.ResultSetMetadata.Builder,
+                com.google.spanner.v1.ResultSetMetadataOrBuilder>(
                 getMetadata(), getParentForChildren(), isClean());
         metadata_ = null;
       }
@@ -1168,7 +1199,7 @@ public Builder addRows(int index, com.google.protobuf.ListValue.Builder builderF
      *
      * repeated .google.protobuf.ListValue rows = 2;
      */
-    public Builder addAllRows(Iterable values) {
+    public Builder addAllRows(java.lang.Iterable values) {
       if (rowsBuilder_ == null) {
         ensureRowsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, rows_);
@@ -1355,9 +1386,11 @@ public java.util.List getRowsBuilderList(
       return rowsBuilder_;
     }
 
-    private ResultSetStats stats_;
+    private com.google.spanner.v1.ResultSetStats stats_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            ResultSetStats, ResultSetStats.Builder, ResultSetStatsOrBuilder>
+            com.google.spanner.v1.ResultSetStats,
+            com.google.spanner.v1.ResultSetStats.Builder,
+            com.google.spanner.v1.ResultSetStatsOrBuilder>
         statsBuilder_;
     /**
      *
@@ -1398,9 +1431,9 @@ public boolean hasStats() {
      *
      * @return The stats.
      */
-    public ResultSetStats getStats() {
+    public com.google.spanner.v1.ResultSetStats getStats() {
       if (statsBuilder_ == null) {
-        return stats_ == null ? ResultSetStats.getDefaultInstance() : stats_;
+        return stats_ == null ? com.google.spanner.v1.ResultSetStats.getDefaultInstance() : stats_;
       } else {
         return statsBuilder_.getMessage();
       }
@@ -1421,7 +1454,7 @@ public ResultSetStats getStats() {
      *
      * .google.spanner.v1.ResultSetStats stats = 3;
      */
-    public Builder setStats(ResultSetStats value) {
+    public Builder setStats(com.google.spanner.v1.ResultSetStats value) {
       if (statsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1450,7 +1483,7 @@ public Builder setStats(ResultSetStats value) {
      *
      * .google.spanner.v1.ResultSetStats stats = 3;
      */
-    public Builder setStats(ResultSetStats.Builder builderForValue) {
+    public Builder setStats(com.google.spanner.v1.ResultSetStats.Builder builderForValue) {
       if (statsBuilder_ == null) {
         stats_ = builderForValue.build();
         onChanged();
@@ -1476,10 +1509,13 @@ public Builder setStats(ResultSetStats.Builder builderForValue) {
      *
      * .google.spanner.v1.ResultSetStats stats = 3;
      */
-    public Builder mergeStats(ResultSetStats value) {
+    public Builder mergeStats(com.google.spanner.v1.ResultSetStats value) {
       if (statsBuilder_ == null) {
         if (stats_ != null) {
-          stats_ = ResultSetStats.newBuilder(stats_).mergeFrom(value).buildPartial();
+          stats_ =
+              com.google.spanner.v1.ResultSetStats.newBuilder(stats_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           stats_ = value;
         }
@@ -1533,7 +1569,7 @@ public Builder clearStats() {
      *
      * .google.spanner.v1.ResultSetStats stats = 3;
      */
-    public ResultSetStats.Builder getStatsBuilder() {
+    public com.google.spanner.v1.ResultSetStats.Builder getStatsBuilder() {
 
       onChanged();
       return getStatsFieldBuilder().getBuilder();
@@ -1554,11 +1590,11 @@ public ResultSetStats.Builder getStatsBuilder() {
      *
      * .google.spanner.v1.ResultSetStats stats = 3;
      */
-    public ResultSetStatsOrBuilder getStatsOrBuilder() {
+    public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
       if (statsBuilder_ != null) {
         return statsBuilder_.getMessageOrBuilder();
       } else {
-        return stats_ == null ? ResultSetStats.getDefaultInstance() : stats_;
+        return stats_ == null ? com.google.spanner.v1.ResultSetStats.getDefaultInstance() : stats_;
       }
     }
     /**
@@ -1578,24 +1614,28 @@ public ResultSetStatsOrBuilder getStatsOrBuilder() {
      * .google.spanner.v1.ResultSetStats stats = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            ResultSetStats, ResultSetStats.Builder, ResultSetStatsOrBuilder>
+            com.google.spanner.v1.ResultSetStats,
+            com.google.spanner.v1.ResultSetStats.Builder,
+            com.google.spanner.v1.ResultSetStatsOrBuilder>
         getStatsFieldBuilder() {
       if (statsBuilder_ == null) {
         statsBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                ResultSetStats, ResultSetStats.Builder, ResultSetStatsOrBuilder>(
+                com.google.spanner.v1.ResultSetStats,
+                com.google.spanner.v1.ResultSetStats.Builder,
+                com.google.spanner.v1.ResultSetStatsOrBuilder>(
                 getStats(), getParentForChildren(), isClean());
         stats_ = null;
       }
       return statsBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1605,19 +1645,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.ResultSet)
-  private static final ResultSet DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.ResultSet DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new ResultSet();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.ResultSet();
   }
 
-  public static ResultSet getDefaultInstance() {
+  public static com.google.spanner.v1.ResultSet getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public ResultSet parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1630,13 +1670,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public ResultSet getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.ResultSet getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java
index 414ab9066d..a9d3e4f45b 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java
@@ -39,13 +39,13 @@ private ResultSetMetadata(com.google.protobuf.GeneratedMessageV3.Builder buil
 
   private ResultSetMetadata() {}
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ResultSetMetadata();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -56,7 +56,7 @@ private ResultSetMetadata(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -70,11 +70,12 @@ private ResultSetMetadata(
             break;
           case 10:
             {
-              StructType.Builder subBuilder = null;
+              com.google.spanner.v1.StructType.Builder subBuilder = null;
               if (rowType_ != null) {
                 subBuilder = rowType_.toBuilder();
               }
-              rowType_ = input.readMessage(StructType.parser(), extensionRegistry);
+              rowType_ =
+                  input.readMessage(com.google.spanner.v1.StructType.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(rowType_);
                 rowType_ = subBuilder.buildPartial();
@@ -84,11 +85,12 @@ private ResultSetMetadata(
             }
           case 18:
             {
-              Transaction.Builder subBuilder = null;
+              com.google.spanner.v1.Transaction.Builder subBuilder = null;
               if (transaction_ != null) {
                 subBuilder = transaction_.toBuilder();
               }
-              transaction_ = input.readMessage(Transaction.parser(), extensionRegistry);
+              transaction_ =
+                  input.readMessage(com.google.spanner.v1.Transaction.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(transaction_);
                 transaction_ = subBuilder.buildPartial();
@@ -116,17 +118,22 @@ private ResultSetMetadata(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
+    return com.google.spanner.v1.ResultSetProto
+        .internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(ResultSetMetadata.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.ResultSetProto
+        .internal_static_google_spanner_v1_ResultSetMetadata_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.ResultSetMetadata.class,
+            com.google.spanner.v1.ResultSetMetadata.Builder.class);
   }
 
   public static final int ROW_TYPE_FIELD_NUMBER = 1;
-  private StructType rowType_;
+  private com.google.spanner.v1.StructType rowType_;
   /**
    *
    *
@@ -144,7 +151,7 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return Whether the rowType field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasRowType() {
     return rowType_ != null;
   }
@@ -165,9 +172,9 @@ public boolean hasRowType() {
    *
    * @return The rowType.
    */
-  @Override
-  public StructType getRowType() {
-    return rowType_ == null ? StructType.getDefaultInstance() : rowType_;
+  @java.lang.Override
+  public com.google.spanner.v1.StructType getRowType() {
+    return rowType_ == null ? com.google.spanner.v1.StructType.getDefaultInstance() : rowType_;
   }
   /**
    *
@@ -184,13 +191,13 @@ public StructType getRowType() {
    *
    * .google.spanner.v1.StructType row_type = 1;
    */
-  @Override
-  public StructTypeOrBuilder getRowTypeOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.StructTypeOrBuilder getRowTypeOrBuilder() {
     return getRowType();
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 2;
-  private Transaction transaction_;
+  private com.google.spanner.v1.Transaction transaction_;
   /**
    *
    *
@@ -203,7 +210,7 @@ public StructTypeOrBuilder getRowTypeOrBuilder() {
    *
    * @return Whether the transaction field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasTransaction() {
     return transaction_ != null;
   }
@@ -219,9 +226,11 @@ public boolean hasTransaction() {
    *
    * @return The transaction.
    */
-  @Override
-  public Transaction getTransaction() {
-    return transaction_ == null ? Transaction.getDefaultInstance() : transaction_;
+  @java.lang.Override
+  public com.google.spanner.v1.Transaction getTransaction() {
+    return transaction_ == null
+        ? com.google.spanner.v1.Transaction.getDefaultInstance()
+        : transaction_;
   }
   /**
    *
@@ -233,14 +242,14 @@ public Transaction getTransaction() {
    *
    * .google.spanner.v1.Transaction transaction = 2;
    */
-  @Override
-  public TransactionOrBuilder getTransactionOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
     return getTransaction();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -250,7 +259,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (rowType_ != null) {
       output.writeMessage(1, getRowType());
@@ -261,7 +270,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -278,15 +287,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof ResultSetMetadata)) {
+    if (!(obj instanceof com.google.spanner.v1.ResultSetMetadata)) {
       return super.equals(obj);
     }
-    ResultSetMetadata other = (ResultSetMetadata) obj;
+    com.google.spanner.v1.ResultSetMetadata other = (com.google.spanner.v1.ResultSetMetadata) obj;
 
     if (hasRowType() != other.hasRowType()) return false;
     if (hasRowType()) {
@@ -300,7 +309,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -320,69 +329,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static ResultSetMetadata parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.ResultSetMetadata parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ResultSetMetadata parseFrom(
+  public static com.google.spanner.v1.ResultSetMetadata parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ResultSetMetadata parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.ResultSetMetadata parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ResultSetMetadata parseFrom(
+  public static com.google.spanner.v1.ResultSetMetadata parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ResultSetMetadata parseFrom(byte[] data)
+  public static com.google.spanner.v1.ResultSetMetadata parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ResultSetMetadata parseFrom(
+  public static com.google.spanner.v1.ResultSetMetadata parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ResultSetMetadata parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.ResultSetMetadata parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static ResultSetMetadata parseFrom(
+  public static com.google.spanner.v1.ResultSetMetadata 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 ResultSetMetadata parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.ResultSetMetadata parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static ResultSetMetadata parseDelimitedFrom(
+  public static com.google.spanner.v1.ResultSetMetadata 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 ResultSetMetadata parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.ResultSetMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static ResultSetMetadata parseFrom(
+  public static com.google.spanner.v1.ResultSetMetadata parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -390,7 +401,7 @@ public static ResultSetMetadata parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -399,17 +410,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(ResultSetMetadata prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.ResultSetMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -425,15 +436,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.ResultSetMetadata)
-      ResultSetMetadataOrBuilder {
+      com.google.spanner.v1.ResultSetMetadataOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
+      return com.google.spanner.v1.ResultSetProto
+          .internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(ResultSetMetadata.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.ResultSetProto
+          .internal_static_google_spanner_v1_ResultSetMetadata_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.ResultSetMetadata.class,
+              com.google.spanner.v1.ResultSetMetadata.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.ResultSetMetadata.newBuilder()
@@ -441,7 +457,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -450,7 +466,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (rowTypeBuilder_ == null) {
@@ -468,28 +484,30 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
+      return com.google.spanner.v1.ResultSetProto
+          .internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
     }
 
-    @Override
-    public ResultSetMetadata getDefaultInstanceForType() {
-      return ResultSetMetadata.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.ResultSetMetadata getDefaultInstanceForType() {
+      return com.google.spanner.v1.ResultSetMetadata.getDefaultInstance();
     }
 
-    @Override
-    public ResultSetMetadata build() {
-      ResultSetMetadata result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.ResultSetMetadata build() {
+      com.google.spanner.v1.ResultSetMetadata result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public ResultSetMetadata buildPartial() {
-      ResultSetMetadata result = new ResultSetMetadata(this);
+    @java.lang.Override
+    public com.google.spanner.v1.ResultSetMetadata buildPartial() {
+      com.google.spanner.v1.ResultSetMetadata result =
+          new com.google.spanner.v1.ResultSetMetadata(this);
       if (rowTypeBuilder_ == null) {
         result.rowType_ = rowType_;
       } else {
@@ -504,50 +522,51 @@ public ResultSetMetadata buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof ResultSetMetadata) {
-        return mergeFrom((ResultSetMetadata) other);
+      if (other instanceof com.google.spanner.v1.ResultSetMetadata) {
+        return mergeFrom((com.google.spanner.v1.ResultSetMetadata) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(ResultSetMetadata other) {
-      if (other == ResultSetMetadata.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.ResultSetMetadata other) {
+      if (other == com.google.spanner.v1.ResultSetMetadata.getDefaultInstance()) return this;
       if (other.hasRowType()) {
         mergeRowType(other.getRowType());
       }
@@ -559,21 +578,21 @@ public Builder mergeFrom(ResultSetMetadata other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      ResultSetMetadata parsedMessage = null;
+      com.google.spanner.v1.ResultSetMetadata parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (ResultSetMetadata) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.ResultSetMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -583,9 +602,11 @@ public Builder mergeFrom(
       return this;
     }
 
-    private StructType rowType_;
+    private com.google.spanner.v1.StructType rowType_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            StructType, StructType.Builder, StructTypeOrBuilder>
+            com.google.spanner.v1.StructType,
+            com.google.spanner.v1.StructType.Builder,
+            com.google.spanner.v1.StructTypeOrBuilder>
         rowTypeBuilder_;
     /**
      *
@@ -624,9 +645,9 @@ public boolean hasRowType() {
      *
      * @return The rowType.
      */
-    public StructType getRowType() {
+    public com.google.spanner.v1.StructType getRowType() {
       if (rowTypeBuilder_ == null) {
-        return rowType_ == null ? StructType.getDefaultInstance() : rowType_;
+        return rowType_ == null ? com.google.spanner.v1.StructType.getDefaultInstance() : rowType_;
       } else {
         return rowTypeBuilder_.getMessage();
       }
@@ -646,7 +667,7 @@ public StructType getRowType() {
      *
      * .google.spanner.v1.StructType row_type = 1;
      */
-    public Builder setRowType(StructType value) {
+    public Builder setRowType(com.google.spanner.v1.StructType value) {
       if (rowTypeBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -674,7 +695,7 @@ public Builder setRowType(StructType value) {
      *
      * .google.spanner.v1.StructType row_type = 1;
      */
-    public Builder setRowType(StructType.Builder builderForValue) {
+    public Builder setRowType(com.google.spanner.v1.StructType.Builder builderForValue) {
       if (rowTypeBuilder_ == null) {
         rowType_ = builderForValue.build();
         onChanged();
@@ -699,10 +720,11 @@ public Builder setRowType(StructType.Builder builderForValue) {
      *
      * .google.spanner.v1.StructType row_type = 1;
      */
-    public Builder mergeRowType(StructType value) {
+    public Builder mergeRowType(com.google.spanner.v1.StructType value) {
       if (rowTypeBuilder_ == null) {
         if (rowType_ != null) {
-          rowType_ = StructType.newBuilder(rowType_).mergeFrom(value).buildPartial();
+          rowType_ =
+              com.google.spanner.v1.StructType.newBuilder(rowType_).mergeFrom(value).buildPartial();
         } else {
           rowType_ = value;
         }
@@ -754,7 +776,7 @@ public Builder clearRowType() {
      *
      * .google.spanner.v1.StructType row_type = 1;
      */
-    public StructType.Builder getRowTypeBuilder() {
+    public com.google.spanner.v1.StructType.Builder getRowTypeBuilder() {
 
       onChanged();
       return getRowTypeFieldBuilder().getBuilder();
@@ -774,11 +796,11 @@ public StructType.Builder getRowTypeBuilder() {
      *
      * .google.spanner.v1.StructType row_type = 1;
      */
-    public StructTypeOrBuilder getRowTypeOrBuilder() {
+    public com.google.spanner.v1.StructTypeOrBuilder getRowTypeOrBuilder() {
       if (rowTypeBuilder_ != null) {
         return rowTypeBuilder_.getMessageOrBuilder();
       } else {
-        return rowType_ == null ? StructType.getDefaultInstance() : rowType_;
+        return rowType_ == null ? com.google.spanner.v1.StructType.getDefaultInstance() : rowType_;
       }
     }
     /**
@@ -797,21 +819,27 @@ public StructTypeOrBuilder getRowTypeOrBuilder() {
      * .google.spanner.v1.StructType row_type = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            StructType, StructType.Builder, StructTypeOrBuilder>
+            com.google.spanner.v1.StructType,
+            com.google.spanner.v1.StructType.Builder,
+            com.google.spanner.v1.StructTypeOrBuilder>
         getRowTypeFieldBuilder() {
       if (rowTypeBuilder_ == null) {
         rowTypeBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                StructType, StructType.Builder, StructTypeOrBuilder>(
+                com.google.spanner.v1.StructType,
+                com.google.spanner.v1.StructType.Builder,
+                com.google.spanner.v1.StructTypeOrBuilder>(
                 getRowType(), getParentForChildren(), isClean());
         rowType_ = null;
       }
       return rowTypeBuilder_;
     }
 
-    private Transaction transaction_;
+    private com.google.spanner.v1.Transaction transaction_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            Transaction, Transaction.Builder, TransactionOrBuilder>
+            com.google.spanner.v1.Transaction,
+            com.google.spanner.v1.Transaction.Builder,
+            com.google.spanner.v1.TransactionOrBuilder>
         transactionBuilder_;
     /**
      *
@@ -840,9 +868,11 @@ public boolean hasTransaction() {
      *
      * @return The transaction.
      */
-    public Transaction getTransaction() {
+    public com.google.spanner.v1.Transaction getTransaction() {
       if (transactionBuilder_ == null) {
-        return transaction_ == null ? Transaction.getDefaultInstance() : transaction_;
+        return transaction_ == null
+            ? com.google.spanner.v1.Transaction.getDefaultInstance()
+            : transaction_;
       } else {
         return transactionBuilder_.getMessage();
       }
@@ -857,7 +887,7 @@ public Transaction getTransaction() {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Builder setTransaction(Transaction value) {
+    public Builder setTransaction(com.google.spanner.v1.Transaction value) {
       if (transactionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -880,7 +910,7 @@ public Builder setTransaction(Transaction value) {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Builder setTransaction(Transaction.Builder builderForValue) {
+    public Builder setTransaction(com.google.spanner.v1.Transaction.Builder builderForValue) {
       if (transactionBuilder_ == null) {
         transaction_ = builderForValue.build();
         onChanged();
@@ -900,10 +930,13 @@ public Builder setTransaction(Transaction.Builder builderForValue) {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Builder mergeTransaction(Transaction value) {
+    public Builder mergeTransaction(com.google.spanner.v1.Transaction value) {
       if (transactionBuilder_ == null) {
         if (transaction_ != null) {
-          transaction_ = Transaction.newBuilder(transaction_).mergeFrom(value).buildPartial();
+          transaction_ =
+              com.google.spanner.v1.Transaction.newBuilder(transaction_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           transaction_ = value;
         }
@@ -945,7 +978,7 @@ public Builder clearTransaction() {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public Transaction.Builder getTransactionBuilder() {
+    public com.google.spanner.v1.Transaction.Builder getTransactionBuilder() {
 
       onChanged();
       return getTransactionFieldBuilder().getBuilder();
@@ -960,11 +993,13 @@ public Transaction.Builder getTransactionBuilder() {
      *
      * .google.spanner.v1.Transaction transaction = 2;
      */
-    public TransactionOrBuilder getTransactionOrBuilder() {
+    public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
       if (transactionBuilder_ != null) {
         return transactionBuilder_.getMessageOrBuilder();
       } else {
-        return transaction_ == null ? Transaction.getDefaultInstance() : transaction_;
+        return transaction_ == null
+            ? com.google.spanner.v1.Transaction.getDefaultInstance()
+            : transaction_;
       }
     }
     /**
@@ -978,24 +1013,28 @@ public TransactionOrBuilder getTransactionOrBuilder() {
      * .google.spanner.v1.Transaction transaction = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            Transaction, Transaction.Builder, TransactionOrBuilder>
+            com.google.spanner.v1.Transaction,
+            com.google.spanner.v1.Transaction.Builder,
+            com.google.spanner.v1.TransactionOrBuilder>
         getTransactionFieldBuilder() {
       if (transactionBuilder_ == null) {
         transactionBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                Transaction, Transaction.Builder, TransactionOrBuilder>(
+                com.google.spanner.v1.Transaction,
+                com.google.spanner.v1.Transaction.Builder,
+                com.google.spanner.v1.TransactionOrBuilder>(
                 getTransaction(), getParentForChildren(), isClean());
         transaction_ = null;
       }
       return transactionBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1005,19 +1044,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.ResultSetMetadata)
-  private static final ResultSetMetadata DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.ResultSetMetadata DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new ResultSetMetadata();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.ResultSetMetadata();
   }
 
-  public static ResultSetMetadata getDefaultInstance() {
+  public static com.google.spanner.v1.ResultSetMetadata getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public ResultSetMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1030,13 +1069,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public ResultSetMetadata getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.ResultSetMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadataOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadataOrBuilder.java
index 64ef83de88..e1a554096f 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadataOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadataOrBuilder.java
@@ -58,7 +58,7 @@ public interface ResultSetMetadataOrBuilder
    *
    * @return The rowType.
    */
-  StructType getRowType();
+  com.google.spanner.v1.StructType getRowType();
   /**
    *
    *
@@ -74,7 +74,7 @@ public interface ResultSetMetadataOrBuilder
    *
    * .google.spanner.v1.StructType row_type = 1;
    */
-  StructTypeOrBuilder getRowTypeOrBuilder();
+  com.google.spanner.v1.StructTypeOrBuilder getRowTypeOrBuilder();
 
   /**
    *
@@ -101,7 +101,7 @@ public interface ResultSetMetadataOrBuilder
    *
    * @return The transaction.
    */
-  Transaction getTransaction();
+  com.google.spanner.v1.Transaction getTransaction();
   /**
    *
    *
@@ -112,5 +112,5 @@ public interface ResultSetMetadataOrBuilder
    *
    * .google.spanner.v1.Transaction transaction = 2;
    */
-  TransactionOrBuilder getTransactionOrBuilder();
+  com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetOrBuilder.java
index 11d76aec5d..81a2f13afd 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetOrBuilder.java
@@ -46,7 +46,7 @@ public interface ResultSetOrBuilder
    *
    * @return The metadata.
    */
-  ResultSetMetadata getMetadata();
+  com.google.spanner.v1.ResultSetMetadata getMetadata();
   /**
    *
    *
@@ -56,7 +56,7 @@ public interface ResultSetOrBuilder
    *
    * .google.spanner.v1.ResultSetMetadata metadata = 1;
    */
-  ResultSetMetadataOrBuilder getMetadataOrBuilder();
+  com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder();
 
   /**
    *
@@ -171,7 +171,7 @@ public interface ResultSetOrBuilder
    *
    * @return The stats.
    */
-  ResultSetStats getStats();
+  com.google.spanner.v1.ResultSetStats getStats();
   /**
    *
    *
@@ -188,5 +188,5 @@ public interface ResultSetOrBuilder
    *
    * .google.spanner.v1.ResultSetStats stats = 3;
    */
-  ResultSetStatsOrBuilder getStatsOrBuilder();
+  com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java
index 9adad1aa4d..48157af205 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java
@@ -51,7 +51,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
   static {
-    String[] descriptorData = {
+    java.lang.String[] descriptorData = {
       "\n\"google/spanner/v1/result_set.proto\022\021go"
           + "ogle.spanner.v1\032\034google/protobuf/struct."
           + "proto\032\"google/spanner/v1/query_plan.prot"
@@ -86,9 +86,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.protobuf.StructProto.getDescriptor(),
-              QueryPlanProto.getDescriptor(),
-              TransactionProto.getDescriptor(),
-              TypeProto.getDescriptor(),
+              com.google.spanner.v1.QueryPlanProto.getDescriptor(),
+              com.google.spanner.v1.TransactionProto.getDescriptor(),
+              com.google.spanner.v1.TypeProto.getDescriptor(),
               com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_spanner_v1_ResultSet_descriptor =
@@ -96,7 +96,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_ResultSet_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_ResultSet_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Metadata", "Rows", "Stats",
             });
     internal_static_google_spanner_v1_PartialResultSet_descriptor =
@@ -104,7 +104,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_PartialResultSet_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_PartialResultSet_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Metadata", "Values", "ChunkedValue", "ResumeToken", "Stats",
             });
     internal_static_google_spanner_v1_ResultSetMetadata_descriptor =
@@ -112,7 +112,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_ResultSetMetadata_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_ResultSetMetadata_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "RowType", "Transaction",
             });
     internal_static_google_spanner_v1_ResultSetStats_descriptor =
@@ -120,13 +120,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_ResultSetStats_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_ResultSetStats_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "QueryPlan", "QueryStats", "RowCountExact", "RowCountLowerBound", "RowCount",
             });
     com.google.protobuf.StructProto.getDescriptor();
-    QueryPlanProto.getDescriptor();
-    TransactionProto.getDescriptor();
-    TypeProto.getDescriptor();
+    com.google.spanner.v1.QueryPlanProto.getDescriptor();
+    com.google.spanner.v1.TransactionProto.getDescriptor();
+    com.google.spanner.v1.TypeProto.getDescriptor();
     com.google.api.AnnotationsProto.getDescriptor();
   }
 
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java
index dc085e3fe8..cbd9063c37 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java
@@ -39,13 +39,13 @@ private ResultSetStats(com.google.protobuf.GeneratedMessageV3.Builder builder
 
   private ResultSetStats() {}
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ResultSetStats();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -56,7 +56,7 @@ private ResultSetStats(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -70,11 +70,12 @@ private ResultSetStats(
             break;
           case 10:
             {
-              QueryPlan.Builder subBuilder = null;
+              com.google.spanner.v1.QueryPlan.Builder subBuilder = null;
               if (queryPlan_ != null) {
                 subBuilder = queryPlan_.toBuilder();
               }
-              queryPlan_ = input.readMessage(QueryPlan.parser(), extensionRegistry);
+              queryPlan_ =
+                  input.readMessage(com.google.spanner.v1.QueryPlan.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(queryPlan_);
                 queryPlan_ = subBuilder.buildPartial();
@@ -129,19 +130,27 @@ private ResultSetStats(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_descriptor;
+    return com.google.spanner.v1.ResultSetProto
+        .internal_static_google_spanner_v1_ResultSetStats_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(ResultSetStats.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.ResultSetProto
+        .internal_static_google_spanner_v1_ResultSetStats_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.ResultSetStats.class,
+            com.google.spanner.v1.ResultSetStats.Builder.class);
   }
 
   private int rowCountCase_ = 0;
-  private Object rowCount_;
+  private java.lang.Object rowCount_;
 
-  public enum RowCountCase implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
+  public enum RowCountCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     ROW_COUNT_EXACT(3),
     ROW_COUNT_LOWER_BOUND(4),
     ROWCOUNT_NOT_SET(0);
@@ -155,7 +164,7 @@ private RowCountCase(int value) {
      * @return The enum associated with the given number.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @Deprecated
+    @java.lang.Deprecated
     public static RowCountCase valueOf(int value) {
       return forNumber(value);
     }
@@ -183,7 +192,7 @@ public RowCountCase getRowCountCase() {
   }
 
   public static final int QUERY_PLAN_FIELD_NUMBER = 1;
-  private QueryPlan queryPlan_;
+  private com.google.spanner.v1.QueryPlan queryPlan_;
   /**
    *
    *
@@ -195,7 +204,7 @@ public RowCountCase getRowCountCase() {
    *
    * @return Whether the queryPlan field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasQueryPlan() {
     return queryPlan_ != null;
   }
@@ -210,9 +219,9 @@ public boolean hasQueryPlan() {
    *
    * @return The queryPlan.
    */
-  @Override
-  public QueryPlan getQueryPlan() {
-    return queryPlan_ == null ? QueryPlan.getDefaultInstance() : queryPlan_;
+  @java.lang.Override
+  public com.google.spanner.v1.QueryPlan getQueryPlan() {
+    return queryPlan_ == null ? com.google.spanner.v1.QueryPlan.getDefaultInstance() : queryPlan_;
   }
   /**
    *
@@ -223,8 +232,8 @@ public QueryPlan getQueryPlan() {
    *
    * .google.spanner.v1.QueryPlan query_plan = 1;
    */
-  @Override
-  public QueryPlanOrBuilder getQueryPlanOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.QueryPlanOrBuilder getQueryPlanOrBuilder() {
     return getQueryPlan();
   }
 
@@ -248,7 +257,7 @@ public QueryPlanOrBuilder getQueryPlanOrBuilder() {
    *
    * @return Whether the queryStats field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasQueryStats() {
     return queryStats_ != null;
   }
@@ -270,7 +279,7 @@ public boolean hasQueryStats() {
    *
    * @return The queryStats.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Struct getQueryStats() {
     return queryStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : queryStats_;
   }
@@ -290,7 +299,7 @@ public com.google.protobuf.Struct getQueryStats() {
    *
    * .google.protobuf.Struct query_stats = 2;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.StructOrBuilder getQueryStatsOrBuilder() {
     return getQueryStats();
   }
@@ -322,10 +331,10 @@ public boolean hasRowCountExact() {
    *
    * @return The rowCountExact.
    */
-  @Override
+  @java.lang.Override
   public long getRowCountExact() {
     if (rowCountCase_ == 3) {
-      return (Long) rowCount_;
+      return (java.lang.Long) rowCount_;
     }
     return 0L;
   }
@@ -359,17 +368,17 @@ public boolean hasRowCountLowerBound() {
    *
    * @return The rowCountLowerBound.
    */
-  @Override
+  @java.lang.Override
   public long getRowCountLowerBound() {
     if (rowCountCase_ == 4) {
-      return (Long) rowCount_;
+      return (java.lang.Long) rowCount_;
     }
     return 0L;
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -379,7 +388,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (queryPlan_ != null) {
       output.writeMessage(1, getQueryPlan());
@@ -388,15 +397,15 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       output.writeMessage(2, getQueryStats());
     }
     if (rowCountCase_ == 3) {
-      output.writeInt64(3, (long) ((Long) rowCount_));
+      output.writeInt64(3, (long) ((java.lang.Long) rowCount_));
     }
     if (rowCountCase_ == 4) {
-      output.writeInt64(4, (long) ((Long) rowCount_));
+      output.writeInt64(4, (long) ((java.lang.Long) rowCount_));
     }
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -409,25 +418,29 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQueryStats());
     }
     if (rowCountCase_ == 3) {
-      size += com.google.protobuf.CodedOutputStream.computeInt64Size(3, (long) ((Long) rowCount_));
+      size +=
+          com.google.protobuf.CodedOutputStream.computeInt64Size(
+              3, (long) ((java.lang.Long) rowCount_));
     }
     if (rowCountCase_ == 4) {
-      size += com.google.protobuf.CodedOutputStream.computeInt64Size(4, (long) ((Long) rowCount_));
+      size +=
+          com.google.protobuf.CodedOutputStream.computeInt64Size(
+              4, (long) ((java.lang.Long) rowCount_));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof ResultSetStats)) {
+    if (!(obj instanceof com.google.spanner.v1.ResultSetStats)) {
       return super.equals(obj);
     }
-    ResultSetStats other = (ResultSetStats) obj;
+    com.google.spanner.v1.ResultSetStats other = (com.google.spanner.v1.ResultSetStats) obj;
 
     if (hasQueryPlan() != other.hasQueryPlan()) return false;
     if (hasQueryPlan()) {
@@ -452,7 +465,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -484,69 +497,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static ResultSetStats parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.ResultSetStats parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ResultSetStats parseFrom(
+  public static com.google.spanner.v1.ResultSetStats parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ResultSetStats parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.ResultSetStats parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ResultSetStats parseFrom(
+  public static com.google.spanner.v1.ResultSetStats parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ResultSetStats parseFrom(byte[] data)
+  public static com.google.spanner.v1.ResultSetStats parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static ResultSetStats parseFrom(
+  public static com.google.spanner.v1.ResultSetStats parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static ResultSetStats parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.ResultSetStats parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static ResultSetStats parseFrom(
+  public static com.google.spanner.v1.ResultSetStats 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 ResultSetStats parseDelimitedFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.ResultSetStats parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static ResultSetStats parseDelimitedFrom(
+  public static com.google.spanner.v1.ResultSetStats 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 ResultSetStats parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.ResultSetStats parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static ResultSetStats parseFrom(
+  public static com.google.spanner.v1.ResultSetStats parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -554,7 +568,7 @@ public static ResultSetStats parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -563,17 +577,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(ResultSetStats prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.ResultSetStats prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -589,15 +603,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.ResultSetStats)
-      ResultSetStatsOrBuilder {
+      com.google.spanner.v1.ResultSetStatsOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_descriptor;
+      return com.google.spanner.v1.ResultSetProto
+          .internal_static_google_spanner_v1_ResultSetStats_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(ResultSetStats.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.ResultSetProto
+          .internal_static_google_spanner_v1_ResultSetStats_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.ResultSetStats.class,
+              com.google.spanner.v1.ResultSetStats.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.ResultSetStats.newBuilder()
@@ -605,7 +624,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -614,7 +633,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (queryPlanBuilder_ == null) {
@@ -634,28 +653,29 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_descriptor;
+      return com.google.spanner.v1.ResultSetProto
+          .internal_static_google_spanner_v1_ResultSetStats_descriptor;
     }
 
-    @Override
-    public ResultSetStats getDefaultInstanceForType() {
-      return ResultSetStats.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.ResultSetStats getDefaultInstanceForType() {
+      return com.google.spanner.v1.ResultSetStats.getDefaultInstance();
     }
 
-    @Override
-    public ResultSetStats build() {
-      ResultSetStats result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.ResultSetStats build() {
+      com.google.spanner.v1.ResultSetStats result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public ResultSetStats buildPartial() {
-      ResultSetStats result = new ResultSetStats(this);
+    @java.lang.Override
+    public com.google.spanner.v1.ResultSetStats buildPartial() {
+      com.google.spanner.v1.ResultSetStats result = new com.google.spanner.v1.ResultSetStats(this);
       if (queryPlanBuilder_ == null) {
         result.queryPlan_ = queryPlan_;
       } else {
@@ -677,50 +697,51 @@ public ResultSetStats buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof ResultSetStats) {
-        return mergeFrom((ResultSetStats) other);
+      if (other instanceof com.google.spanner.v1.ResultSetStats) {
+        return mergeFrom((com.google.spanner.v1.ResultSetStats) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(ResultSetStats other) {
-      if (other == ResultSetStats.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.ResultSetStats other) {
+      if (other == com.google.spanner.v1.ResultSetStats.getDefaultInstance()) return this;
       if (other.hasQueryPlan()) {
         mergeQueryPlan(other.getQueryPlan());
       }
@@ -748,21 +769,21 @@ public Builder mergeFrom(ResultSetStats other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      ResultSetStats parsedMessage = null;
+      com.google.spanner.v1.ResultSetStats parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (ResultSetStats) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.ResultSetStats) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -773,7 +794,7 @@ public Builder mergeFrom(
     }
 
     private int rowCountCase_ = 0;
-    private Object rowCount_;
+    private java.lang.Object rowCount_;
 
     public RowCountCase getRowCountCase() {
       return RowCountCase.forNumber(rowCountCase_);
@@ -786,9 +807,11 @@ public Builder clearRowCount() {
       return this;
     }
 
-    private QueryPlan queryPlan_;
+    private com.google.spanner.v1.QueryPlan queryPlan_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            QueryPlan, QueryPlan.Builder, QueryPlanOrBuilder>
+            com.google.spanner.v1.QueryPlan,
+            com.google.spanner.v1.QueryPlan.Builder,
+            com.google.spanner.v1.QueryPlanOrBuilder>
         queryPlanBuilder_;
     /**
      *
@@ -815,9 +838,11 @@ public boolean hasQueryPlan() {
      *
      * @return The queryPlan.
      */
-    public QueryPlan getQueryPlan() {
+    public com.google.spanner.v1.QueryPlan getQueryPlan() {
       if (queryPlanBuilder_ == null) {
-        return queryPlan_ == null ? QueryPlan.getDefaultInstance() : queryPlan_;
+        return queryPlan_ == null
+            ? com.google.spanner.v1.QueryPlan.getDefaultInstance()
+            : queryPlan_;
       } else {
         return queryPlanBuilder_.getMessage();
       }
@@ -831,7 +856,7 @@ public QueryPlan getQueryPlan() {
      *
      * .google.spanner.v1.QueryPlan query_plan = 1;
      */
-    public Builder setQueryPlan(QueryPlan value) {
+    public Builder setQueryPlan(com.google.spanner.v1.QueryPlan value) {
       if (queryPlanBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -853,7 +878,7 @@ public Builder setQueryPlan(QueryPlan value) {
      *
      * .google.spanner.v1.QueryPlan query_plan = 1;
      */
-    public Builder setQueryPlan(QueryPlan.Builder builderForValue) {
+    public Builder setQueryPlan(com.google.spanner.v1.QueryPlan.Builder builderForValue) {
       if (queryPlanBuilder_ == null) {
         queryPlan_ = builderForValue.build();
         onChanged();
@@ -872,10 +897,13 @@ public Builder setQueryPlan(QueryPlan.Builder builderForValue) {
      *
      * .google.spanner.v1.QueryPlan query_plan = 1;
      */
-    public Builder mergeQueryPlan(QueryPlan value) {
+    public Builder mergeQueryPlan(com.google.spanner.v1.QueryPlan value) {
       if (queryPlanBuilder_ == null) {
         if (queryPlan_ != null) {
-          queryPlan_ = QueryPlan.newBuilder(queryPlan_).mergeFrom(value).buildPartial();
+          queryPlan_ =
+              com.google.spanner.v1.QueryPlan.newBuilder(queryPlan_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           queryPlan_ = value;
         }
@@ -915,7 +943,7 @@ public Builder clearQueryPlan() {
      *
      * .google.spanner.v1.QueryPlan query_plan = 1;
      */
-    public QueryPlan.Builder getQueryPlanBuilder() {
+    public com.google.spanner.v1.QueryPlan.Builder getQueryPlanBuilder() {
 
       onChanged();
       return getQueryPlanFieldBuilder().getBuilder();
@@ -929,11 +957,13 @@ public QueryPlan.Builder getQueryPlanBuilder() {
      *
      * .google.spanner.v1.QueryPlan query_plan = 1;
      */
-    public QueryPlanOrBuilder getQueryPlanOrBuilder() {
+    public com.google.spanner.v1.QueryPlanOrBuilder getQueryPlanOrBuilder() {
       if (queryPlanBuilder_ != null) {
         return queryPlanBuilder_.getMessageOrBuilder();
       } else {
-        return queryPlan_ == null ? QueryPlan.getDefaultInstance() : queryPlan_;
+        return queryPlan_ == null
+            ? com.google.spanner.v1.QueryPlan.getDefaultInstance()
+            : queryPlan_;
       }
     }
     /**
@@ -946,12 +976,16 @@ public QueryPlanOrBuilder getQueryPlanOrBuilder() {
      * .google.spanner.v1.QueryPlan query_plan = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            QueryPlan, QueryPlan.Builder, QueryPlanOrBuilder>
+            com.google.spanner.v1.QueryPlan,
+            com.google.spanner.v1.QueryPlan.Builder,
+            com.google.spanner.v1.QueryPlanOrBuilder>
         getQueryPlanFieldBuilder() {
       if (queryPlanBuilder_ == null) {
         queryPlanBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                QueryPlan, QueryPlan.Builder, QueryPlanOrBuilder>(
+                com.google.spanner.v1.QueryPlan,
+                com.google.spanner.v1.QueryPlan.Builder,
+                com.google.spanner.v1.QueryPlanOrBuilder>(
                 getQueryPlan(), getParentForChildren(), isClean());
         queryPlan_ = null;
       }
@@ -1227,7 +1261,7 @@ public boolean hasRowCountExact() {
      */
     public long getRowCountExact() {
       if (rowCountCase_ == 3) {
-        return (Long) rowCount_;
+        return (java.lang.Long) rowCount_;
       }
       return 0L;
     }
@@ -1298,7 +1332,7 @@ public boolean hasRowCountLowerBound() {
      */
     public long getRowCountLowerBound() {
       if (rowCountCase_ == 4) {
-        return (Long) rowCount_;
+        return (java.lang.Long) rowCount_;
       }
       return 0L;
     }
@@ -1342,12 +1376,12 @@ public Builder clearRowCountLowerBound() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1357,19 +1391,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.ResultSetStats)
-  private static final ResultSetStats DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.ResultSetStats DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new ResultSetStats();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.ResultSetStats();
   }
 
-  public static ResultSetStats getDefaultInstance() {
+  public static com.google.spanner.v1.ResultSetStats getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public ResultSetStats parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1382,13 +1416,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public ResultSetStats getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.ResultSetStats getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStatsOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStatsOrBuilder.java
index 3de5bd1ded..9a01e754b4 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStatsOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStatsOrBuilder.java
@@ -46,7 +46,7 @@ public interface ResultSetStatsOrBuilder
    *
    * @return The queryPlan.
    */
-  QueryPlan getQueryPlan();
+  com.google.spanner.v1.QueryPlan getQueryPlan();
   /**
    *
    *
@@ -56,7 +56,7 @@ public interface ResultSetStatsOrBuilder
    *
    * .google.spanner.v1.QueryPlan query_plan = 1;
    */
-  QueryPlanOrBuilder getQueryPlanOrBuilder();
+  com.google.spanner.v1.QueryPlanOrBuilder getQueryPlanOrBuilder();
 
   /**
    *
@@ -166,5 +166,5 @@ public interface ResultSetStatsOrBuilder
    */
   long getRowCountLowerBound();
 
-  public ResultSetStats.RowCountCase getRowCountCase();
+  public com.google.spanner.v1.ResultSetStats.RowCountCase getRowCountCase();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java
index 9eee022683..93a40a3950 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java
@@ -42,13 +42,13 @@ private RollbackRequest() {
     transactionId_ = com.google.protobuf.ByteString.EMPTY;
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new RollbackRequest();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private RollbackRequest(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -73,7 +73,7 @@ private RollbackRequest(
             break;
           case 10:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               session_ = s;
               break;
@@ -103,17 +103,22 @@ private RollbackRequest(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_RollbackRequest_descriptor;
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_RollbackRequest_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto.internal_static_google_spanner_v1_RollbackRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(RollbackRequest.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_RollbackRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.RollbackRequest.class,
+            com.google.spanner.v1.RollbackRequest.Builder.class);
   }
 
   public static final int SESSION_FIELD_NUMBER = 1;
-  private volatile Object session_;
+  private volatile java.lang.Object session_;
   /**
    *
    *
@@ -127,14 +132,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return The session.
    */
-  @Override
-  public String getSession() {
-    Object ref = session_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  public java.lang.String getSession() {
+    java.lang.Object ref = session_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       session_ = s;
       return s;
     }
@@ -152,11 +157,12 @@ public String getSession() {
    *
    * @return The bytes for session.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getSessionBytes() {
-    Object ref = session_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    java.lang.Object ref = session_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
       session_ = b;
       return b;
     } else {
@@ -177,14 +183,14 @@ public com.google.protobuf.ByteString getSessionBytes() {
    *
    * @return The transactionId.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getTransactionId() {
     return transactionId_;
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -194,7 +200,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, session_);
@@ -205,7 +211,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -222,15 +228,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof RollbackRequest)) {
+    if (!(obj instanceof com.google.spanner.v1.RollbackRequest)) {
       return super.equals(obj);
     }
-    RollbackRequest other = (RollbackRequest) obj;
+    com.google.spanner.v1.RollbackRequest other = (com.google.spanner.v1.RollbackRequest) obj;
 
     if (!getSession().equals(other.getSession())) return false;
     if (!getTransactionId().equals(other.getTransactionId())) return false;
@@ -238,7 +244,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -254,69 +260,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static RollbackRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.RollbackRequest parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static RollbackRequest parseFrom(
+  public static com.google.spanner.v1.RollbackRequest parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static RollbackRequest parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.RollbackRequest parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static RollbackRequest parseFrom(
+  public static com.google.spanner.v1.RollbackRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static RollbackRequest parseFrom(byte[] data)
+  public static com.google.spanner.v1.RollbackRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static RollbackRequest parseFrom(
+  public static com.google.spanner.v1.RollbackRequest parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static RollbackRequest parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.RollbackRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static RollbackRequest parseFrom(
+  public static com.google.spanner.v1.RollbackRequest 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 RollbackRequest parseDelimitedFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.RollbackRequest parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static RollbackRequest parseDelimitedFrom(
+  public static com.google.spanner.v1.RollbackRequest 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 RollbackRequest parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.RollbackRequest parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static RollbackRequest parseFrom(
+  public static com.google.spanner.v1.RollbackRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -324,7 +331,7 @@ public static RollbackRequest parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -333,17 +340,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(RollbackRequest prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.RollbackRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -359,15 +366,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.RollbackRequest)
-      RollbackRequestOrBuilder {
+      com.google.spanner.v1.RollbackRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_RollbackRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_RollbackRequest_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto.internal_static_google_spanner_v1_RollbackRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(RollbackRequest.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_RollbackRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.RollbackRequest.class,
+              com.google.spanner.v1.RollbackRequest.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.RollbackRequest.newBuilder()
@@ -375,7 +387,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -384,7 +396,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -394,78 +406,81 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_RollbackRequest_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_RollbackRequest_descriptor;
     }
 
-    @Override
-    public RollbackRequest getDefaultInstanceForType() {
-      return RollbackRequest.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.RollbackRequest getDefaultInstanceForType() {
+      return com.google.spanner.v1.RollbackRequest.getDefaultInstance();
     }
 
-    @Override
-    public RollbackRequest build() {
-      RollbackRequest result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.RollbackRequest build() {
+      com.google.spanner.v1.RollbackRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public RollbackRequest buildPartial() {
-      RollbackRequest result = new RollbackRequest(this);
+    @java.lang.Override
+    public com.google.spanner.v1.RollbackRequest buildPartial() {
+      com.google.spanner.v1.RollbackRequest result =
+          new com.google.spanner.v1.RollbackRequest(this);
       result.session_ = session_;
       result.transactionId_ = transactionId_;
       onBuilt();
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof RollbackRequest) {
-        return mergeFrom((RollbackRequest) other);
+      if (other instanceof com.google.spanner.v1.RollbackRequest) {
+        return mergeFrom((com.google.spanner.v1.RollbackRequest) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(RollbackRequest other) {
-      if (other == RollbackRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.RollbackRequest other) {
+      if (other == com.google.spanner.v1.RollbackRequest.getDefaultInstance()) return this;
       if (!other.getSession().isEmpty()) {
         session_ = other.session_;
         onChanged();
@@ -478,21 +493,21 @@ public Builder mergeFrom(RollbackRequest other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      RollbackRequest parsedMessage = null;
+      com.google.spanner.v1.RollbackRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (RollbackRequest) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.RollbackRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -502,7 +517,7 @@ public Builder mergeFrom(
       return this;
     }
 
-    private Object session_ = "";
+    private java.lang.Object session_ = "";
     /**
      *
      *
@@ -516,15 +531,15 @@ public Builder mergeFrom(
      *
      * @return The session.
      */
-    public String getSession() {
-      Object ref = session_;
-      if (!(ref instanceof String)) {
+    public java.lang.String getSession() {
+      java.lang.Object ref = session_;
+      if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         session_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -541,10 +556,10 @@ public String getSession() {
      * @return The bytes for session.
      */
     public com.google.protobuf.ByteString getSessionBytes() {
-      Object ref = session_;
+      java.lang.Object ref = session_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         session_ = b;
         return b;
       } else {
@@ -565,7 +580,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
      * @param value The session to set.
      * @return This builder for chaining.
      */
-    public Builder setSession(String value) {
+    public Builder setSession(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -630,7 +645,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) {
      *
      * @return The transactionId.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ByteString getTransactionId() {
       return transactionId_;
     }
@@ -673,12 +688,12 @@ public Builder clearTransactionId() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -688,19 +703,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.RollbackRequest)
-  private static final RollbackRequest DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.RollbackRequest DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new RollbackRequest();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.RollbackRequest();
   }
 
-  public static RollbackRequest getDefaultInstance() {
+  public static com.google.spanner.v1.RollbackRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public RollbackRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -713,13 +728,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public RollbackRequest getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.RollbackRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequestOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequestOrBuilder.java
index 6a3fb040c3..06a29aeb00 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequestOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequestOrBuilder.java
@@ -36,7 +36,7 @@ public interface RollbackRequestOrBuilder
    *
    * @return The session.
    */
-  String getSession();
+  java.lang.String getSession();
   /**
    *
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java
index ad04cbf05e..1b058eb621 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java
@@ -41,13 +41,13 @@ private Session() {
     name_ = "";
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Session();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private Session(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -73,7 +73,7 @@ private Session(
             break;
           case 10:
             {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               name_ = s;
               break;
@@ -85,7 +85,7 @@ private Session(
                     com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
                 mutable_bitField0_ |= 0x00000001;
               }
-              com.google.protobuf.MapEntry labels__ =
+              com.google.protobuf.MapEntry labels__ =
                   input.readMessage(
                       LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
               labels_.getMutableMap().put(labels__.getKey(), labels__.getValue());
@@ -141,11 +141,11 @@ private Session(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return SpannerProto.internal_static_google_spanner_v1_Session_descriptor;
+    return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_Session_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
-  @Override
+  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 2:
@@ -155,14 +155,17 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
     }
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return SpannerProto.internal_static_google_spanner_v1_Session_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(Session.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.SpannerProto
+        .internal_static_google_spanner_v1_Session_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.Session.class, com.google.spanner.v1.Session.Builder.class);
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-  private volatile Object name_;
+  private volatile java.lang.Object name_;
   /**
    *
    *
@@ -174,14 +177,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return The name.
    */
-  @Override
-  public String getName() {
-    Object ref = name_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  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;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       name_ = s;
       return s;
     }
@@ -197,11 +200,12 @@ public String getName() {
    *
    * @return The bytes for name.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getNameBytes() {
-    Object ref = name_;
-    if (ref instanceof String) {
-      com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+    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 {
@@ -212,18 +216,19 @@ public com.google.protobuf.ByteString getNameBytes() {
   public static final int LABELS_FIELD_NUMBER = 2;
 
   private static final class LabelsDefaultEntryHolder {
-    static final com.google.protobuf.MapEntry defaultEntry =
-        com.google.protobuf.MapEntry.newDefaultInstance(
-            SpannerProto.internal_static_google_spanner_v1_Session_LabelsEntry_descriptor,
+    static final com.google.protobuf.MapEntry defaultEntry =
+        com.google.protobuf.MapEntry.newDefaultInstance(
+            com.google.spanner.v1.SpannerProto
+                .internal_static_google_spanner_v1_Session_LabelsEntry_descriptor,
             com.google.protobuf.WireFormat.FieldType.STRING,
             "",
             com.google.protobuf.WireFormat.FieldType.STRING,
             "");
   }
 
-  private com.google.protobuf.MapField labels_;
+  private com.google.protobuf.MapField labels_;
 
-  private com.google.protobuf.MapField internalGetLabels() {
+  private com.google.protobuf.MapField internalGetLabels() {
     if (labels_ == null) {
       return com.google.protobuf.MapField.emptyMapField(LabelsDefaultEntryHolder.defaultEntry);
     }
@@ -248,17 +253,17 @@ public int getLabelsCount() {
    *
    * map<string, string> labels = 2;
    */
-  @Override
-  public boolean containsLabels(String key) {
+  @java.lang.Override
+  public boolean containsLabels(java.lang.String key) {
     if (key == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     return internalGetLabels().getMap().containsKey(key);
   }
   /** Use {@link #getLabelsMap()} instead. */
-  @Override
-  @Deprecated
-  public java.util.Map getLabels() {
+  @java.lang.Override
+  @java.lang.Deprecated
+  public java.util.Map getLabels() {
     return getLabelsMap();
   }
   /**
@@ -276,8 +281,8 @@ public java.util.Map getLabels() {
    *
    * map<string, string> labels = 2;
    */
-  @Override
-  public java.util.Map getLabelsMap() {
+  @java.lang.Override
+  public java.util.Map getLabelsMap() {
     return internalGetLabels().getMap();
   }
   /**
@@ -295,12 +300,12 @@ public java.util.Map getLabelsMap() {
    *
    * map<string, string> labels = 2;
    */
-  @Override
-  public String getLabelsOrDefault(String key, String defaultValue) {
+  @java.lang.Override
+  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
-    java.util.Map map = internalGetLabels().getMap();
+    java.util.Map map = internalGetLabels().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
   /**
@@ -318,14 +323,14 @@ public String getLabelsOrDefault(String key, String defaultValue) {
    *
    * map<string, string> labels = 2;
    */
-  @Override
-  public String getLabelsOrThrow(String key) {
+  @java.lang.Override
+  public java.lang.String getLabelsOrThrow(java.lang.String key) {
     if (key == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
-    java.util.Map map = internalGetLabels().getMap();
+    java.util.Map map = internalGetLabels().getMap();
     if (!map.containsKey(key)) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
     return map.get(key);
   }
@@ -344,7 +349,7 @@ public String getLabelsOrThrow(String key) {
    *
    * @return Whether the createTime field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasCreateTime() {
     return createTime_ != null;
   }
@@ -360,7 +365,7 @@ public boolean hasCreateTime() {
    *
    * @return The createTime.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Timestamp getCreateTime() {
     return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
@@ -374,7 +379,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    * .google.protobuf.Timestamp create_time = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * 
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
     return getCreateTime();
   }
@@ -395,7 +400,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    *
    * @return Whether the approximateLastUseTime field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasApproximateLastUseTime() {
     return approximateLastUseTime_ != null;
   }
@@ -413,7 +418,7 @@ public boolean hasApproximateLastUseTime() {
    *
    * @return The approximateLastUseTime.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Timestamp getApproximateLastUseTime() {
     return approximateLastUseTime_ == null
         ? com.google.protobuf.Timestamp.getDefaultInstance()
@@ -431,14 +436,14 @@ public com.google.protobuf.Timestamp getApproximateLastUseTime() {
    * .google.protobuf.Timestamp approximate_last_use_time = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * 
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getApproximateLastUseTimeOrBuilder() {
     return getApproximateLastUseTime();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -448,7 +453,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
@@ -464,7 +469,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -473,8 +478,9 @@ public int getSerializedSize() {
     if (!getNameBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    for (java.util.Map.Entry entry : internalGetLabels().getMap().entrySet()) {
-      com.google.protobuf.MapEntry labels__ =
+    for (java.util.Map.Entry entry :
+        internalGetLabels().getMap().entrySet()) {
+      com.google.protobuf.MapEntry labels__ =
           LabelsDefaultEntryHolder.defaultEntry
               .newBuilderForType()
               .setKey(entry.getKey())
@@ -494,15 +500,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof Session)) {
+    if (!(obj instanceof com.google.spanner.v1.Session)) {
       return super.equals(obj);
     }
-    Session other = (Session) obj;
+    com.google.spanner.v1.Session other = (com.google.spanner.v1.Session) obj;
 
     if (!getName().equals(other.getName())) return false;
     if (!internalGetLabels().equals(other.internalGetLabels())) return false;
@@ -518,7 +524,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -544,68 +550,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static Session parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.Session parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Session parseFrom(
+  public static com.google.spanner.v1.Session parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Session parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.Session parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Session parseFrom(
+  public static com.google.spanner.v1.Session parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Session parseFrom(byte[] data)
+  public static com.google.spanner.v1.Session parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Session parseFrom(
+  public static com.google.spanner.v1.Session parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Session parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.Session parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static Session parseFrom(
+  public static com.google.spanner.v1.Session 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 Session parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.Session parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static Session parseDelimitedFrom(
+  public static com.google.spanner.v1.Session 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 Session parseFrom(com.google.protobuf.CodedInputStream input)
+  public static com.google.spanner.v1.Session parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static Session parseFrom(
+  public static com.google.spanner.v1.Session parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -613,7 +621,7 @@ public static Session parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -622,17 +630,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(Session prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.Session prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -648,9 +656,10 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.Session)
-      SessionOrBuilder {
+      com.google.spanner.v1.SessionOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return SpannerProto.internal_static_google_spanner_v1_Session_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_Session_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -673,10 +682,13 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       }
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return SpannerProto.internal_static_google_spanner_v1_Session_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(Session.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_Session_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.Session.class, com.google.spanner.v1.Session.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.Session.newBuilder()
@@ -684,7 +696,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -693,7 +705,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -714,28 +726,29 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return SpannerProto.internal_static_google_spanner_v1_Session_descriptor;
+      return com.google.spanner.v1.SpannerProto
+          .internal_static_google_spanner_v1_Session_descriptor;
     }
 
-    @Override
-    public Session getDefaultInstanceForType() {
-      return Session.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.Session getDefaultInstanceForType() {
+      return com.google.spanner.v1.Session.getDefaultInstance();
     }
 
-    @Override
-    public Session build() {
-      Session result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.Session build() {
+      com.google.spanner.v1.Session result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public Session buildPartial() {
-      Session result = new Session(this);
+    @java.lang.Override
+    public com.google.spanner.v1.Session buildPartial() {
+      com.google.spanner.v1.Session result = new com.google.spanner.v1.Session(this);
       int from_bitField0_ = bitField0_;
       result.name_ = name_;
       result.labels_ = internalGetLabels();
@@ -754,50 +767,51 @@ public Session buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof Session) {
-        return mergeFrom((Session) other);
+      if (other instanceof com.google.spanner.v1.Session) {
+        return mergeFrom((com.google.spanner.v1.Session) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(Session other) {
-      if (other == Session.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.Session other) {
+      if (other == com.google.spanner.v1.Session.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
         onChanged();
@@ -814,21 +828,21 @@ public Builder mergeFrom(Session other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Session parsedMessage = null;
+      com.google.spanner.v1.Session parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (Session) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.Session) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -840,7 +854,7 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private Object name_ = "";
+    private java.lang.Object name_ = "";
     /**
      *
      *
@@ -852,15 +866,15 @@ public Builder mergeFrom(
      *
      * @return The name.
      */
-    public String getName() {
-      Object ref = name_;
-      if (!(ref instanceof String)) {
+    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;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         name_ = s;
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -875,10 +889,10 @@ public String getName() {
      * @return The bytes for name.
      */
     public com.google.protobuf.ByteString getNameBytes() {
-      Object ref = name_;
+      java.lang.Object ref = name_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         name_ = b;
         return b;
       } else {
@@ -897,7 +911,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      * @param value The name to set.
      * @return This builder for chaining.
      */
-    public Builder setName(String value) {
+    public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -946,16 +960,17 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
-    private com.google.protobuf.MapField labels_;
+    private com.google.protobuf.MapField labels_;
 
-    private com.google.protobuf.MapField internalGetLabels() {
+    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() {
+    private com.google.protobuf.MapField
+        internalGetMutableLabels() {
       onChanged();
       ;
       if (labels_ == null) {
@@ -985,17 +1000,17 @@ public int getLabelsCount() {
      *
      * map<string, string> labels = 2;
      */
-    @Override
-    public boolean containsLabels(String key) {
+    @java.lang.Override
+    public boolean containsLabels(java.lang.String key) {
       if (key == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       return internalGetLabels().getMap().containsKey(key);
     }
     /** Use {@link #getLabelsMap()} instead. */
-    @Override
-    @Deprecated
-    public java.util.Map getLabels() {
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map getLabels() {
       return getLabelsMap();
     }
     /**
@@ -1013,8 +1028,8 @@ public java.util.Map getLabels() {
      *
      * map<string, string> labels = 2;
      */
-    @Override
-    public java.util.Map getLabelsMap() {
+    @java.lang.Override
+    public java.util.Map getLabelsMap() {
       return internalGetLabels().getMap();
     }
     /**
@@ -1032,12 +1047,13 @@ public java.util.Map getLabelsMap() {
      *
      * map<string, string> labels = 2;
      */
-    @Override
-    public String getLabelsOrDefault(String key, String defaultValue) {
+    @java.lang.Override
+    public java.lang.String getLabelsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
-      java.util.Map map = internalGetLabels().getMap();
+      java.util.Map map = internalGetLabels().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
@@ -1055,14 +1071,14 @@ public String getLabelsOrDefault(String key, String defaultValue) {
      *
      * map<string, string> labels = 2;
      */
-    @Override
-    public String getLabelsOrThrow(String key) {
+    @java.lang.Override
+    public java.lang.String getLabelsOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
-      java.util.Map map = internalGetLabels().getMap();
+      java.util.Map map = internalGetLabels().getMap();
       if (!map.containsKey(key)) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
       return map.get(key);
     }
@@ -1086,16 +1102,16 @@ public Builder clearLabels() {
      *
      * map<string, string> labels = 2;
      */
-    public Builder removeLabels(String key) {
+    public Builder removeLabels(java.lang.String key) {
       if (key == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       internalGetMutableLabels().getMutableMap().remove(key);
       return this;
     }
     /** Use alternate mutation accessors instead. */
-    @Deprecated
-    public java.util.Map getMutableLabels() {
+    @java.lang.Deprecated
+    public java.util.Map getMutableLabels() {
       return internalGetMutableLabels().getMutableMap();
     }
     /**
@@ -1113,12 +1129,12 @@ public java.util.Map getMutableLabels() {
      *
      * map<string, string> labels = 2;
      */
-    public Builder putLabels(String key, String value) {
+    public Builder putLabels(java.lang.String key, java.lang.String value) {
       if (key == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       if (value == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       internalGetMutableLabels().getMutableMap().put(key, value);
       return this;
@@ -1138,7 +1154,7 @@ public Builder putLabels(String key, String value) {
      *
      * map<string, string> labels = 2;
      */
-    public Builder putAllLabels(java.util.Map values) {
+    public Builder putAllLabels(java.util.Map values) {
       internalGetMutableLabels().getMutableMap().putAll(values);
       return this;
     }
@@ -1557,12 +1573,12 @@ public com.google.protobuf.TimestampOrBuilder getApproximateLastUseTimeOrBuilder
       return approximateLastUseTimeBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1572,19 +1588,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.Session)
-  private static final Session DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.Session DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new Session();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.Session();
   }
 
-  public static Session getDefaultInstance() {
+  public static com.google.spanner.v1.Session getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public Session parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1597,13 +1613,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public Session getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.Session getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SessionOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SessionOrBuilder.java
index 4344161ff8..556832d009 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SessionOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SessionOrBuilder.java
@@ -34,7 +34,7 @@ public interface SessionOrBuilder
    *
    * @return The name.
    */
-  String getName();
+  java.lang.String getName();
   /**
    *
    *
@@ -79,10 +79,10 @@ public interface SessionOrBuilder
    *
    * map<string, string> labels = 2;
    */
-  boolean containsLabels(String key);
+  boolean containsLabels(java.lang.String key);
   /** Use {@link #getLabelsMap()} instead. */
-  @Deprecated
-  java.util.Map getLabels();
+  @java.lang.Deprecated
+  java.util.Map getLabels();
   /**
    *
    *
@@ -98,7 +98,7 @@ public interface SessionOrBuilder
    *
    * map<string, string> labels = 2;
    */
-  java.util.Map getLabelsMap();
+  java.util.Map getLabelsMap();
   /**
    *
    *
@@ -114,7 +114,7 @@ public interface SessionOrBuilder
    *
    * map<string, string> labels = 2;
    */
-  String getLabelsOrDefault(String key, String defaultValue);
+  java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue);
   /**
    *
    *
@@ -130,7 +130,7 @@ public interface SessionOrBuilder
    *
    * map<string, string> labels = 2;
    */
-  String getLabelsOrThrow(String key);
+  java.lang.String getLabelsOrThrow(java.lang.String key);
 
   /**
    *
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java
index f968b0da51..0d1175fb19 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java
@@ -152,220 +152,220 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
 
   static {
     java.lang.String[] descriptorData = {
-        "\n\037google/spanner/v1/spanner.proto\022\021googl"
-            + "e.spanner.v1\032\034google/api/annotations.pro"
-            + "to\032\027google/api/client.proto\032\037google/api/"
-            + "field_behavior.proto\032\031google/api/resourc"
-            + "e.proto\032\036google/protobuf/duration.proto\032"
-            + "\033google/protobuf/empty.proto\032\034google/pro"
-            + "tobuf/struct.proto\032\037google/protobuf/time"
-            + "stamp.proto\032\027google/rpc/status.proto\032\034go"
-            + "ogle/spanner/v1/keys.proto\032 google/spann"
-            + "er/v1/mutation.proto\032\"google/spanner/v1/"
-            + "result_set.proto\032#google/spanner/v1/tran"
-            + "saction.proto\032\034google/spanner/v1/type.pr"
-            + "oto\"~\n\024CreateSessionRequest\0229\n\010database\030"
-            + "\001 \001(\tB\'\340A\002\372A!\n\037spanner.googleapis.com/Da"
-            + "tabase\022+\n\007session\030\002 \001(\0132\032.google.spanner"
-            + ".v1.Session\"\251\001\n\032BatchCreateSessionsReque"
-            + "st\0229\n\010database\030\001 \001(\tB\'\340A\002\372A!\n\037spanner.go"
-            + "ogleapis.com/Database\0224\n\020session_templat"
-            + "e\030\002 \001(\0132\032.google.spanner.v1.Session\022\032\n\rs"
-            + "ession_count\030\003 \001(\005B\003\340A\002\"J\n\033BatchCreateSe"
-            + "ssionsResponse\022+\n\007session\030\001 \003(\0132\032.google"
-            + ".spanner.v1.Session\"\363\002\n\007Session\022\021\n\004name\030"
-            + "\001 \001(\tB\003\340A\003\0226\n\006labels\030\002 \003(\0132&.google.span"
-            + "ner.v1.Session.LabelsEntry\0224\n\013create_tim"
-            + "e\030\003 \001(\0132\032.google.protobuf.TimestampB\003\340A\003"
-            + "\022B\n\031approximate_last_use_time\030\004 \001(\0132\032.go"
-            + "ogle.protobuf.TimestampB\003\340A\003\032-\n\013LabelsEn"
-            + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001:t\352Aq"
-            + "\n\036spanner.googleapis.com/Session\022Oprojec"
-            + "ts/{project}/instances/{instance}/databa"
-            + "ses/{database}/sessions/{session}\"I\n\021Get"
-            + "SessionRequest\0224\n\004name\030\001 \001(\tB&\340A\002\372A \n\036sp"
-            + "anner.googleapis.com/Session\"\207\001\n\023ListSes"
-            + "sionsRequest\0229\n\010database\030\001 \001(\tB\'\340A\002\372A!\n\037"
-            + "spanner.googleapis.com/Database\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\"]\n\024ListSessionsResponse\022,\n\010sessio"
-            + "ns\030\001 \003(\0132\032.google.spanner.v1.Session\022\027\n\017"
-            + "next_page_token\030\002 \001(\t\"L\n\024DeleteSessionRe"
-            + "quest\0224\n\004name\030\001 \001(\tB&\340A\002\372A \n\036spanner.goo"
-            + "gleapis.com/Session\"\334\001\n\016RequestOptions\022<"
-            + "\n\010priority\030\001 \001(\0162*.google.spanner.v1.Req"
-            + "uestOptions.Priority\022\023\n\013request_tag\030\002 \001("
-            + "\t\022\027\n\017transaction_tag\030\003 \001(\t\"^\n\010Priority\022\030"
-            + "\n\024PRIORITY_UNSPECIFIED\020\000\022\020\n\014PRIORITY_LOW"
-            + "\020\001\022\023\n\017PRIORITY_MEDIUM\020\002\022\021\n\rPRIORITY_HIGH"
-            + "\020\003\"\344\005\n\021ExecuteSqlRequest\0227\n\007session\030\001 \001("
-            + "\tB&\340A\002\372A \n\036spanner.googleapis.com/Sessio"
-            + "n\022;\n\013transaction\030\002 \001(\0132&.google.spanner."
-            + "v1.TransactionSelector\022\020\n\003sql\030\003 \001(\tB\003\340A\002"
-            + "\022\'\n\006params\030\004 \001(\0132\027.google.protobuf.Struc"
-            + "t\022I\n\013param_types\030\005 \003(\01324.google.spanner."
-            + "v1.ExecuteSqlRequest.ParamTypesEntry\022\024\n\014"
-            + "resume_token\030\006 \001(\014\022B\n\nquery_mode\030\007 \001(\0162."
-            + ".google.spanner.v1.ExecuteSqlRequest.Que"
-            + "ryMode\022\027\n\017partition_token\030\010 \001(\014\022\r\n\005seqno"
-            + "\030\t \001(\003\022H\n\rquery_options\030\n \001(\01321.google.s"
-            + "panner.v1.ExecuteSqlRequest.QueryOptions"
-            + "\022:\n\017request_options\030\013 \001(\0132!.google.spann"
-            + "er.v1.RequestOptions\032O\n\014QueryOptions\022\031\n\021"
-            + "optimizer_version\030\001 \001(\t\022$\n\034optimizer_sta"
-            + "tistics_package\030\002 \001(\t\032J\n\017ParamTypesEntry"
-            + "\022\013\n\003key\030\001 \001(\t\022&\n\005value\030\002 \001(\0132\027.google.sp"
-            + "anner.v1.Type:\0028\001\".\n\tQueryMode\022\n\n\006NORMAL"
-            + "\020\000\022\010\n\004PLAN\020\001\022\013\n\007PROFILE\020\002\"\233\004\n\026ExecuteBat"
-            + "chDmlRequest\0227\n\007session\030\001 \001(\tB&\340A\002\372A \n\036s"
-            + "panner.googleapis.com/Session\022@\n\013transac"
-            + "tion\030\002 \001(\0132&.google.spanner.v1.Transacti"
-            + "onSelectorB\003\340A\002\022L\n\nstatements\030\003 \003(\01323.go"
-            + "ogle.spanner.v1.ExecuteBatchDmlRequest.S"
-            + "tatementB\003\340A\002\022\022\n\005seqno\030\004 \001(\003B\003\340A\002\022:\n\017req"
-            + "uest_options\030\005 \001(\0132!.google.spanner.v1.R"
-            + "equestOptions\032\347\001\n\tStatement\022\013\n\003sql\030\001 \001(\t"
-            + "\022\'\n\006params\030\002 \001(\0132\027.google.protobuf.Struc"
-            + "t\022X\n\013param_types\030\003 \003(\0132C.google.spanner."
-            + "v1.ExecuteBatchDmlRequest.Statement.Para"
-            + "mTypesEntry\032J\n\017ParamTypesEntry\022\013\n\003key\030\001 "
-            + "\001(\t\022&\n\005value\030\002 \001(\0132\027.google.spanner.v1.T"
-            + "ype:\0028\001\"p\n\027ExecuteBatchDmlResponse\0221\n\013re"
-            + "sult_sets\030\001 \003(\0132\034.google.spanner.v1.Resu"
-            + "ltSet\022\"\n\006status\030\002 \001(\0132\022.google.rpc.Statu"
-            + "s\"H\n\020PartitionOptions\022\034\n\024partition_size_"
-            + "bytes\030\001 \001(\003\022\026\n\016max_partitions\030\002 \001(\003\"\243\003\n\025"
-            + "PartitionQueryRequest\0227\n\007session\030\001 \001(\tB&"
-            + "\340A\002\372A \n\036spanner.googleapis.com/Session\022;"
-            + "\n\013transaction\030\002 \001(\0132&.google.spanner.v1."
-            + "TransactionSelector\022\020\n\003sql\030\003 \001(\tB\003\340A\002\022\'\n"
-            + "\006params\030\004 \001(\0132\027.google.protobuf.Struct\022M"
-            + "\n\013param_types\030\005 \003(\01328.google.spanner.v1."
-            + "PartitionQueryRequest.ParamTypesEntry\022>\n"
-            + "\021partition_options\030\006 \001(\0132#.google.spanne"
-            + "r.v1.PartitionOptions\032J\n\017ParamTypesEntry"
-            + "\022\013\n\003key\030\001 \001(\t\022&\n\005value\030\002 \001(\0132\027.google.sp"
-            + "anner.v1.Type:\0028\001\"\261\002\n\024PartitionReadReque"
-            + "st\0227\n\007session\030\001 \001(\tB&\340A\002\372A \n\036spanner.goo"
-            + "gleapis.com/Session\022;\n\013transaction\030\002 \001(\013"
-            + "2&.google.spanner.v1.TransactionSelector"
-            + "\022\022\n\005table\030\003 \001(\tB\003\340A\002\022\r\n\005index\030\004 \001(\t\022\017\n\007c"
-            + "olumns\030\005 \003(\t\022/\n\007key_set\030\006 \001(\0132\031.google.s"
-            + "panner.v1.KeySetB\003\340A\002\022>\n\021partition_optio"
-            + "ns\030\t \001(\0132#.google.spanner.v1.PartitionOp"
-            + "tions\"$\n\tPartition\022\027\n\017partition_token\030\001 "
-            + "\001(\014\"z\n\021PartitionResponse\0220\n\npartitions\030\001"
-            + " \003(\0132\034.google.spanner.v1.Partition\0223\n\013tr"
-            + "ansaction\030\002 \001(\0132\036.google.spanner.v1.Tran"
-            + "saction\"\347\002\n\013ReadRequest\0227\n\007session\030\001 \001(\t"
-            + "B&\340A\002\372A \n\036spanner.googleapis.com/Session"
-            + "\022;\n\013transaction\030\002 \001(\0132&.google.spanner.v"
-            + "1.TransactionSelector\022\022\n\005table\030\003 \001(\tB\003\340A"
-            + "\002\022\r\n\005index\030\004 \001(\t\022\024\n\007columns\030\005 \003(\tB\003\340A\002\022/"
-            + "\n\007key_set\030\006 \001(\0132\031.google.spanner.v1.KeyS"
-            + "etB\003\340A\002\022\r\n\005limit\030\010 \001(\003\022\024\n\014resume_token\030\t"
-            + " \001(\014\022\027\n\017partition_token\030\n \001(\014\022:\n\017request"
-            + "_options\030\013 \001(\0132!.google.spanner.v1.Reque"
-            + "stOptions\"\313\001\n\027BeginTransactionRequest\0227\n"
-            + "\007session\030\001 \001(\tB&\340A\002\372A \n\036spanner.googleap"
-            + "is.com/Session\022;\n\007options\030\002 \001(\0132%.google"
-            + ".spanner.v1.TransactionOptionsB\003\340A\002\022:\n\017r"
-            + "equest_options\030\003 \001(\0132!.google.spanner.v1"
-            + ".RequestOptions\"\303\002\n\rCommitRequest\0227\n\007ses"
-            + "sion\030\001 \001(\tB&\340A\002\372A \n\036spanner.googleapis.c"
-            + "om/Session\022\030\n\016transaction_id\030\002 \001(\014H\000\022G\n\026"
-            + "single_use_transaction\030\003 \001(\0132%.google.sp"
-            + "anner.v1.TransactionOptionsH\000\022.\n\tmutatio"
-            + "ns\030\004 \003(\0132\033.google.spanner.v1.Mutation\022\033\n"
-            + "\023return_commit_stats\030\005 \001(\010\022:\n\017request_op"
-            + "tions\030\006 \001(\0132!.google.spanner.v1.RequestO"
-            + "ptionsB\r\n\013transaction\"\262\001\n\016CommitResponse"
-            + "\0224\n\020commit_timestamp\030\001 \001(\0132\032.google.prot"
-            + "obuf.Timestamp\022C\n\014commit_stats\030\002 \001(\0132-.g"
-            + "oogle.spanner.v1.CommitResponse.CommitSt"
-            + "ats\032%\n\013CommitStats\022\026\n\016mutation_count\030\001 \001"
-            + "(\003\"g\n\017RollbackRequest\0227\n\007session\030\001 \001(\tB&"
-            + "\340A\002\372A \n\036spanner.googleapis.com/Session\022\033"
-            + "\n\016transaction_id\030\002 \001(\014B\003\340A\0022\300\026\n\007Spanner\022"
-            + "\246\001\n\rCreateSession\022\'.google.spanner.v1.Cr"
-            + "eateSessionRequest\032\032.google.spanner.v1.S"
-            + "ession\"P\202\323\344\223\002?\":/v1/{database=projects/*"
-            + "/instances/*/databases/*}/sessions:\001*\332A\010"
-            + "database\022\340\001\n\023BatchCreateSessions\022-.googl"
-            + "e.spanner.v1.BatchCreateSessionsRequest\032"
-            + "..google.spanner.v1.BatchCreateSessionsR"
-            + "esponse\"j\202\323\344\223\002K\"F/v1/{database=projects/"
-            + "*/instances/*/databases/*}/sessions:batc"
-            + "hCreate:\001*\332A\026database,session_count\022\227\001\n\n"
-            + "GetSession\022$.google.spanner.v1.GetSessio"
-            + "nRequest\032\032.google.spanner.v1.Session\"G\202\323"
-            + "\344\223\002:\0228/v1/{name=projects/*/instances/*/d"
-            + "atabases/*/sessions/*}\332A\004name\022\256\001\n\014ListSe"
-            + "ssions\022&.google.spanner.v1.ListSessionsR"
-            + "equest\032\'.google.spanner.v1.ListSessionsR"
-            + "esponse\"M\202\323\344\223\002<\022:/v1/{database=projects/"
-            + "*/instances/*/databases/*}/sessions\332A\010da"
-            + "tabase\022\231\001\n\rDeleteSession\022\'.google.spanne"
-            + "r.v1.DeleteSessionRequest\032\026.google.proto"
-            + "buf.Empty\"G\202\323\344\223\002:*8/v1/{name=projects/*/"
-            + "instances/*/databases/*/sessions/*}\332A\004na"
-            + "me\022\243\001\n\nExecuteSql\022$.google.spanner.v1.Ex"
-            + "ecuteSqlRequest\032\034.google.spanner.v1.Resu"
-            + "ltSet\"Q\202\323\344\223\002K\"F/v1/{session=projects/*/i"
-            + "nstances/*/databases/*/sessions/*}:execu"
-            + "teSql:\001*\022\276\001\n\023ExecuteStreamingSql\022$.googl"
-            + "e.spanner.v1.ExecuteSqlRequest\032#.google."
-            + "spanner.v1.PartialResultSet\"Z\202\323\344\223\002T\"O/v1"
-            + "/{session=projects/*/instances/*/databas"
-            + "es/*/sessions/*}:executeStreamingSql:\001*0"
-            + "\001\022\300\001\n\017ExecuteBatchDml\022).google.spanner.v"
-            + "1.ExecuteBatchDmlRequest\032*.google.spanne"
-            + "r.v1.ExecuteBatchDmlResponse\"V\202\323\344\223\002P\"K/v"
-            + "1/{session=projects/*/instances/*/databa"
-            + "ses/*/sessions/*}:executeBatchDml:\001*\022\221\001\n"
-            + "\004Read\022\036.google.spanner.v1.ReadRequest\032\034."
-            + "google.spanner.v1.ResultSet\"K\202\323\344\223\002E\"@/v1"
-            + "/{session=projects/*/instances/*/databas"
-            + "es/*/sessions/*}:read:\001*\022\254\001\n\rStreamingRe"
-            + "ad\022\036.google.spanner.v1.ReadRequest\032#.goo"
-            + "gle.spanner.v1.PartialResultSet\"T\202\323\344\223\002N\""
-            + "I/v1/{session=projects/*/instances/*/dat"
-            + "abases/*/sessions/*}:streamingRead:\001*0\001\022"
-            + "\311\001\n\020BeginTransaction\022*.google.spanner.v1"
-            + ".BeginTransactionRequest\032\036.google.spanne"
-            + "r.v1.Transaction\"i\202\323\344\223\002Q\"L/v1/{session=p"
-            + "rojects/*/instances/*/databases/*/sessio"
-            + "ns/*}:beginTransaction:\001*\332A\017session,opti"
-            + "ons\022\353\001\n\006Commit\022 .google.spanner.v1.Commi"
-            + "tRequest\032!.google.spanner.v1.CommitRespo"
-            + "nse\"\233\001\202\323\344\223\002G\"B/v1/{session=projects/*/in"
-            + "stances/*/databases/*/sessions/*}:commit"
-            + ":\001*\332A session,transaction_id,mutations\332A"
-            + "(session,single_use_transaction,mutation"
-            + "s\022\260\001\n\010Rollback\022\".google.spanner.v1.Rollb"
-            + "ackRequest\032\026.google.protobuf.Empty\"h\202\323\344\223"
-            + "\002I\"D/v1/{session=projects/*/instances/*/"
-            + "databases/*/sessions/*}:rollback:\001*\332A\026se"
-            + "ssion,transaction_id\022\267\001\n\016PartitionQuery\022"
-            + "(.google.spanner.v1.PartitionQueryReques"
-            + "t\032$.google.spanner.v1.PartitionResponse\""
-            + "U\202\323\344\223\002O\"J/v1/{session=projects/*/instanc"
-            + "es/*/databases/*/sessions/*}:partitionQu"
-            + "ery:\001*\022\264\001\n\rPartitionRead\022\'.google.spanne"
-            + "r.v1.PartitionReadRequest\032$.google.spann"
-            + "er.v1.PartitionResponse\"T\202\323\344\223\002N\"I/v1/{se"
-            + "ssion=projects/*/instances/*/databases/*"
-            + "/sessions/*}:partitionRead:\001*\032w\312A\026spanne"
-            + "r.googleapis.com\322A[https://www.googleapi"
-            + "s.com/auth/cloud-platform,https://www.go"
-            + "ogleapis.com/auth/spanner.dataB\224\002\n\025com.g"
-            + "oogle.spanner.v1B\014SpannerProtoP\001Z8google"
-            + ".golang.org/genproto/googleapis/spanner/"
-            + "v1;spanner\252\002\027Google.Cloud.Spanner.V1\312\002\027G"
-            + "oogle\\Cloud\\Spanner\\V1\352\002\032Google::Cloud::"
-            + "Spanner::V1\352A_\n\037spanner.googleapis.com/D"
-            + "atabase\022\n"
+          + "\021partition_options\030\006 \001(\0132#.google.spanne"
+          + "r.v1.PartitionOptions\032J\n\017ParamTypesEntry"
+          + "\022\013\n\003key\030\001 \001(\t\022&\n\005value\030\002 \001(\0132\027.google.sp"
+          + "anner.v1.Type:\0028\001\"\261\002\n\024PartitionReadReque"
+          + "st\0227\n\007session\030\001 \001(\tB&\340A\002\372A \n\036spanner.goo"
+          + "gleapis.com/Session\022;\n\013transaction\030\002 \001(\013"
+          + "2&.google.spanner.v1.TransactionSelector"
+          + "\022\022\n\005table\030\003 \001(\tB\003\340A\002\022\r\n\005index\030\004 \001(\t\022\017\n\007c"
+          + "olumns\030\005 \003(\t\022/\n\007key_set\030\006 \001(\0132\031.google.s"
+          + "panner.v1.KeySetB\003\340A\002\022>\n\021partition_optio"
+          + "ns\030\t \001(\0132#.google.spanner.v1.PartitionOp"
+          + "tions\"$\n\tPartition\022\027\n\017partition_token\030\001 "
+          + "\001(\014\"z\n\021PartitionResponse\0220\n\npartitions\030\001"
+          + " \003(\0132\034.google.spanner.v1.Partition\0223\n\013tr"
+          + "ansaction\030\002 \001(\0132\036.google.spanner.v1.Tran"
+          + "saction\"\347\002\n\013ReadRequest\0227\n\007session\030\001 \001(\t"
+          + "B&\340A\002\372A \n\036spanner.googleapis.com/Session"
+          + "\022;\n\013transaction\030\002 \001(\0132&.google.spanner.v"
+          + "1.TransactionSelector\022\022\n\005table\030\003 \001(\tB\003\340A"
+          + "\002\022\r\n\005index\030\004 \001(\t\022\024\n\007columns\030\005 \003(\tB\003\340A\002\022/"
+          + "\n\007key_set\030\006 \001(\0132\031.google.spanner.v1.KeyS"
+          + "etB\003\340A\002\022\r\n\005limit\030\010 \001(\003\022\024\n\014resume_token\030\t"
+          + " \001(\014\022\027\n\017partition_token\030\n \001(\014\022:\n\017request"
+          + "_options\030\013 \001(\0132!.google.spanner.v1.Reque"
+          + "stOptions\"\313\001\n\027BeginTransactionRequest\0227\n"
+          + "\007session\030\001 \001(\tB&\340A\002\372A \n\036spanner.googleap"
+          + "is.com/Session\022;\n\007options\030\002 \001(\0132%.google"
+          + ".spanner.v1.TransactionOptionsB\003\340A\002\022:\n\017r"
+          + "equest_options\030\003 \001(\0132!.google.spanner.v1"
+          + ".RequestOptions\"\303\002\n\rCommitRequest\0227\n\007ses"
+          + "sion\030\001 \001(\tB&\340A\002\372A \n\036spanner.googleapis.c"
+          + "om/Session\022\030\n\016transaction_id\030\002 \001(\014H\000\022G\n\026"
+          + "single_use_transaction\030\003 \001(\0132%.google.sp"
+          + "anner.v1.TransactionOptionsH\000\022.\n\tmutatio"
+          + "ns\030\004 \003(\0132\033.google.spanner.v1.Mutation\022\033\n"
+          + "\023return_commit_stats\030\005 \001(\010\022:\n\017request_op"
+          + "tions\030\006 \001(\0132!.google.spanner.v1.RequestO"
+          + "ptionsB\r\n\013transaction\"\262\001\n\016CommitResponse"
+          + "\0224\n\020commit_timestamp\030\001 \001(\0132\032.google.prot"
+          + "obuf.Timestamp\022C\n\014commit_stats\030\002 \001(\0132-.g"
+          + "oogle.spanner.v1.CommitResponse.CommitSt"
+          + "ats\032%\n\013CommitStats\022\026\n\016mutation_count\030\001 \001"
+          + "(\003\"g\n\017RollbackRequest\0227\n\007session\030\001 \001(\tB&"
+          + "\340A\002\372A \n\036spanner.googleapis.com/Session\022\033"
+          + "\n\016transaction_id\030\002 \001(\014B\003\340A\0022\300\026\n\007Spanner\022"
+          + "\246\001\n\rCreateSession\022\'.google.spanner.v1.Cr"
+          + "eateSessionRequest\032\032.google.spanner.v1.S"
+          + "ession\"P\202\323\344\223\002?\":/v1/{database=projects/*"
+          + "/instances/*/databases/*}/sessions:\001*\332A\010"
+          + "database\022\340\001\n\023BatchCreateSessions\022-.googl"
+          + "e.spanner.v1.BatchCreateSessionsRequest\032"
+          + "..google.spanner.v1.BatchCreateSessionsR"
+          + "esponse\"j\202\323\344\223\002K\"F/v1/{database=projects/"
+          + "*/instances/*/databases/*}/sessions:batc"
+          + "hCreate:\001*\332A\026database,session_count\022\227\001\n\n"
+          + "GetSession\022$.google.spanner.v1.GetSessio"
+          + "nRequest\032\032.google.spanner.v1.Session\"G\202\323"
+          + "\344\223\002:\0228/v1/{name=projects/*/instances/*/d"
+          + "atabases/*/sessions/*}\332A\004name\022\256\001\n\014ListSe"
+          + "ssions\022&.google.spanner.v1.ListSessionsR"
+          + "equest\032\'.google.spanner.v1.ListSessionsR"
+          + "esponse\"M\202\323\344\223\002<\022:/v1/{database=projects/"
+          + "*/instances/*/databases/*}/sessions\332A\010da"
+          + "tabase\022\231\001\n\rDeleteSession\022\'.google.spanne"
+          + "r.v1.DeleteSessionRequest\032\026.google.proto"
+          + "buf.Empty\"G\202\323\344\223\002:*8/v1/{name=projects/*/"
+          + "instances/*/databases/*/sessions/*}\332A\004na"
+          + "me\022\243\001\n\nExecuteSql\022$.google.spanner.v1.Ex"
+          + "ecuteSqlRequest\032\034.google.spanner.v1.Resu"
+          + "ltSet\"Q\202\323\344\223\002K\"F/v1/{session=projects/*/i"
+          + "nstances/*/databases/*/sessions/*}:execu"
+          + "teSql:\001*\022\276\001\n\023ExecuteStreamingSql\022$.googl"
+          + "e.spanner.v1.ExecuteSqlRequest\032#.google."
+          + "spanner.v1.PartialResultSet\"Z\202\323\344\223\002T\"O/v1"
+          + "/{session=projects/*/instances/*/databas"
+          + "es/*/sessions/*}:executeStreamingSql:\001*0"
+          + "\001\022\300\001\n\017ExecuteBatchDml\022).google.spanner.v"
+          + "1.ExecuteBatchDmlRequest\032*.google.spanne"
+          + "r.v1.ExecuteBatchDmlResponse\"V\202\323\344\223\002P\"K/v"
+          + "1/{session=projects/*/instances/*/databa"
+          + "ses/*/sessions/*}:executeBatchDml:\001*\022\221\001\n"
+          + "\004Read\022\036.google.spanner.v1.ReadRequest\032\034."
+          + "google.spanner.v1.ResultSet\"K\202\323\344\223\002E\"@/v1"
+          + "/{session=projects/*/instances/*/databas"
+          + "es/*/sessions/*}:read:\001*\022\254\001\n\rStreamingRe"
+          + "ad\022\036.google.spanner.v1.ReadRequest\032#.goo"
+          + "gle.spanner.v1.PartialResultSet\"T\202\323\344\223\002N\""
+          + "I/v1/{session=projects/*/instances/*/dat"
+          + "abases/*/sessions/*}:streamingRead:\001*0\001\022"
+          + "\311\001\n\020BeginTransaction\022*.google.spanner.v1"
+          + ".BeginTransactionRequest\032\036.google.spanne"
+          + "r.v1.Transaction\"i\202\323\344\223\002Q\"L/v1/{session=p"
+          + "rojects/*/instances/*/databases/*/sessio"
+          + "ns/*}:beginTransaction:\001*\332A\017session,opti"
+          + "ons\022\353\001\n\006Commit\022 .google.spanner.v1.Commi"
+          + "tRequest\032!.google.spanner.v1.CommitRespo"
+          + "nse\"\233\001\202\323\344\223\002G\"B/v1/{session=projects/*/in"
+          + "stances/*/databases/*/sessions/*}:commit"
+          + ":\001*\332A session,transaction_id,mutations\332A"
+          + "(session,single_use_transaction,mutation"
+          + "s\022\260\001\n\010Rollback\022\".google.spanner.v1.Rollb"
+          + "ackRequest\032\026.google.protobuf.Empty\"h\202\323\344\223"
+          + "\002I\"D/v1/{session=projects/*/instances/*/"
+          + "databases/*/sessions/*}:rollback:\001*\332A\026se"
+          + "ssion,transaction_id\022\267\001\n\016PartitionQuery\022"
+          + "(.google.spanner.v1.PartitionQueryReques"
+          + "t\032$.google.spanner.v1.PartitionResponse\""
+          + "U\202\323\344\223\002O\"J/v1/{session=projects/*/instanc"
+          + "es/*/databases/*/sessions/*}:partitionQu"
+          + "ery:\001*\022\264\001\n\rPartitionRead\022\'.google.spanne"
+          + "r.v1.PartitionReadRequest\032$.google.spann"
+          + "er.v1.PartitionResponse\"T\202\323\344\223\002N\"I/v1/{se"
+          + "ssion=projects/*/instances/*/databases/*"
+          + "/sessions/*}:partitionRead:\001*\032w\312A\026spanne"
+          + "r.googleapis.com\322A[https://www.googleapi"
+          + "s.com/auth/cloud-platform,https://www.go"
+          + "ogleapis.com/auth/spanner.dataB\224\002\n\025com.g"
+          + "oogle.spanner.v1B\014SpannerProtoP\001Z8google"
+          + ".golang.org/genproto/googleapis/spanner/"
+          + "v1;spanner\252\002\027Google.Cloud.Spanner.V1\312\002\027G"
+          + "oogle\\Cloud\\Spanner\\V1\352\002\032Google::Cloud::"
+          + "Spanner::V1\352A_\n\037spanner.googleapis.com/D"
+          + "atabase\022();
+                fields_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              fields_.add(input.readMessage(Field.parser(), extensionRegistry));
+              fields_.add(
+                  input.readMessage(
+                      com.google.spanner.v1.StructType.Field.parser(), extensionRegistry));
               break;
             }
           default:
@@ -103,13 +105,16 @@ private StructType(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return TypeProto.internal_static_google_spanner_v1_StructType_descriptor;
+    return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_StructType_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return TypeProto.internal_static_google_spanner_v1_StructType_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(StructType.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.TypeProto
+        .internal_static_google_spanner_v1_StructType_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.StructType.class, com.google.spanner.v1.StructType.Builder.class);
   }
 
   public interface FieldOrBuilder
@@ -134,7 +139,7 @@ public interface FieldOrBuilder
      *
      * @return The name.
      */
-    String getName();
+    java.lang.String getName();
     /**
      *
      *
@@ -177,7 +182,7 @@ public interface FieldOrBuilder
      *
      * @return The type.
      */
-    Type getType();
+    com.google.spanner.v1.Type getType();
     /**
      *
      *
@@ -187,7 +192,7 @@ public interface FieldOrBuilder
      *
      * .google.spanner.v1.Type type = 2;
      */
-    TypeOrBuilder getTypeOrBuilder();
+    com.google.spanner.v1.TypeOrBuilder getTypeOrBuilder();
   }
   /**
    *
@@ -212,13 +217,13 @@ private Field() {
       name_ = "";
     }
 
-    @Override
+    @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Field();
     }
 
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -229,7 +234,7 @@ private Field(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -243,18 +248,18 @@ private Field(
               break;
             case 10:
               {
-                String s = input.readStringRequireUtf8();
+                java.lang.String s = input.readStringRequireUtf8();
 
                 name_ = s;
                 break;
               }
             case 18:
               {
-                Type.Builder subBuilder = null;
+                com.google.spanner.v1.Type.Builder subBuilder = null;
                 if (type_ != null) {
                   subBuilder = type_.toBuilder();
                 }
-                type_ = input.readMessage(Type.parser(), extensionRegistry);
+                type_ = input.readMessage(com.google.spanner.v1.Type.parser(), extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(type_);
                   type_ = subBuilder.buildPartial();
@@ -282,17 +287,22 @@ private Field(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return TypeProto.internal_static_google_spanner_v1_StructType_Field_descriptor;
+      return com.google.spanner.v1.TypeProto
+          .internal_static_google_spanner_v1_StructType_Field_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return TypeProto.internal_static_google_spanner_v1_StructType_Field_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(Field.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.TypeProto
+          .internal_static_google_spanner_v1_StructType_Field_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.StructType.Field.class,
+              com.google.spanner.v1.StructType.Field.Builder.class);
     }
 
     public static final int NAME_FIELD_NUMBER = 1;
-    private volatile Object name_;
+    private volatile java.lang.Object name_;
     /**
      *
      *
@@ -310,14 +320,14 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
      *
      * @return The name.
      */
-    @Override
-    public String getName() {
-      Object ref = name_;
-      if (ref instanceof String) {
-        return (String) ref;
+    @java.lang.Override
+    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;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         name_ = s;
         return s;
       }
@@ -339,12 +349,12 @@ public String getName() {
      *
      * @return The bytes for name.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ByteString getNameBytes() {
-      Object ref = name_;
-      if (ref instanceof String) {
+      java.lang.Object ref = name_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
         name_ = b;
         return b;
       } else {
@@ -353,7 +363,7 @@ public com.google.protobuf.ByteString getNameBytes() {
     }
 
     public static final int TYPE_FIELD_NUMBER = 2;
-    private Type type_;
+    private com.google.spanner.v1.Type type_;
     /**
      *
      *
@@ -365,7 +375,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * @return Whether the type field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasType() {
       return type_ != null;
     }
@@ -380,9 +390,9 @@ public boolean hasType() {
      *
      * @return The type.
      */
-    @Override
-    public Type getType() {
-      return type_ == null ? Type.getDefaultInstance() : type_;
+    @java.lang.Override
+    public com.google.spanner.v1.Type getType() {
+      return type_ == null ? com.google.spanner.v1.Type.getDefaultInstance() : type_;
     }
     /**
      *
@@ -393,14 +403,14 @@ public Type getType() {
      *
      * .google.spanner.v1.Type type = 2;
      */
-    @Override
-    public TypeOrBuilder getTypeOrBuilder() {
+    @java.lang.Override
+    public com.google.spanner.v1.TypeOrBuilder getTypeOrBuilder() {
       return getType();
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -410,7 +420,7 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (!getNameBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
@@ -421,7 +431,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       unknownFields.writeTo(output);
     }
 
-    @Override
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -438,15 +448,15 @@ public int getSerializedSize() {
       return size;
     }
 
-    @Override
-    public boolean equals(final Object obj) {
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof Field)) {
+      if (!(obj instanceof com.google.spanner.v1.StructType.Field)) {
         return super.equals(obj);
       }
-      Field other = (Field) obj;
+      com.google.spanner.v1.StructType.Field other = (com.google.spanner.v1.StructType.Field) obj;
 
       if (!getName().equals(other.getName())) return false;
       if (hasType() != other.hasType()) return false;
@@ -457,7 +467,7 @@ public boolean equals(final Object obj) {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -475,68 +485,71 @@ public int hashCode() {
       return hash;
     }
 
-    public static Field parseFrom(java.nio.ByteBuffer data)
+    public static com.google.spanner.v1.StructType.Field parseFrom(java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static Field parseFrom(
+    public static com.google.spanner.v1.StructType.Field parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static Field parseFrom(com.google.protobuf.ByteString data)
+    public static com.google.spanner.v1.StructType.Field parseFrom(
+        com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static Field parseFrom(
+    public static com.google.spanner.v1.StructType.Field parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static Field parseFrom(byte[] data)
+    public static com.google.spanner.v1.StructType.Field parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static Field parseFrom(
+    public static com.google.spanner.v1.StructType.Field parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static Field parseFrom(java.io.InputStream input) throws java.io.IOException {
+    public static com.google.spanner.v1.StructType.Field parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static Field parseFrom(
+    public static com.google.spanner.v1.StructType.Field 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 Field parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+    public static com.google.spanner.v1.StructType.Field parseDelimitedFrom(
+        java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static Field parseDelimitedFrom(
+    public static com.google.spanner.v1.StructType.Field 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 Field parseFrom(com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.StructType.Field parseFrom(
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static Field parseFrom(
+    public static com.google.spanner.v1.StructType.Field parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -544,7 +557,7 @@ public static Field parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @Override
+    @java.lang.Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -553,17 +566,18 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(Field prototype) {
+    public static Builder newBuilder(com.google.spanner.v1.StructType.Field prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @Override
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
     }
 
-    @Override
-    protected Builder newBuilderForType(BuilderParent parent) {
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -580,15 +594,20 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.StructType.Field)
-        FieldOrBuilder {
+        com.google.spanner.v1.StructType.FieldOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return TypeProto.internal_static_google_spanner_v1_StructType_Field_descriptor;
+        return com.google.spanner.v1.TypeProto
+            .internal_static_google_spanner_v1_StructType_Field_descriptor;
       }
 
-      @Override
-      protected FieldAccessorTable internalGetFieldAccessorTable() {
-        return TypeProto.internal_static_google_spanner_v1_StructType_Field_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(Field.class, Builder.class);
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.spanner.v1.TypeProto
+            .internal_static_google_spanner_v1_StructType_Field_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.spanner.v1.StructType.Field.class,
+                com.google.spanner.v1.StructType.Field.Builder.class);
       }
 
       // Construct using com.google.spanner.v1.StructType.Field.newBuilder()
@@ -596,7 +615,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -605,7 +624,7 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @Override
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         name_ = "";
@@ -619,28 +638,30 @@ public Builder clear() {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return TypeProto.internal_static_google_spanner_v1_StructType_Field_descriptor;
+        return com.google.spanner.v1.TypeProto
+            .internal_static_google_spanner_v1_StructType_Field_descriptor;
       }
 
-      @Override
-      public Field getDefaultInstanceForType() {
-        return Field.getDefaultInstance();
+      @java.lang.Override
+      public com.google.spanner.v1.StructType.Field getDefaultInstanceForType() {
+        return com.google.spanner.v1.StructType.Field.getDefaultInstance();
       }
 
-      @Override
-      public Field build() {
-        Field result = buildPartial();
+      @java.lang.Override
+      public com.google.spanner.v1.StructType.Field build() {
+        com.google.spanner.v1.StructType.Field result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @Override
-      public Field buildPartial() {
-        Field result = new Field(this);
+      @java.lang.Override
+      public com.google.spanner.v1.StructType.Field buildPartial() {
+        com.google.spanner.v1.StructType.Field result =
+            new com.google.spanner.v1.StructType.Field(this);
         result.name_ = name_;
         if (typeBuilder_ == null) {
           result.type_ = type_;
@@ -651,50 +672,53 @@ public Field buildPartial() {
         return result;
       }
 
-      @Override
+      @java.lang.Override
       public Builder clone() {
         return super.clone();
       }
 
-      @Override
-      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.setField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @Override
+      @java.lang.Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof Field) {
-          return mergeFrom((Field) other);
+        if (other instanceof com.google.spanner.v1.StructType.Field) {
+          return mergeFrom((com.google.spanner.v1.StructType.Field) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(Field other) {
-        if (other == Field.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.google.spanner.v1.StructType.Field other) {
+        if (other == com.google.spanner.v1.StructType.Field.getDefaultInstance()) return this;
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
           onChanged();
@@ -707,21 +731,21 @@ public Builder mergeFrom(Field other) {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        Field parsedMessage = null;
+        com.google.spanner.v1.StructType.Field parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (Field) e.getUnfinishedMessage();
+          parsedMessage = (com.google.spanner.v1.StructType.Field) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -731,7 +755,7 @@ public Builder mergeFrom(
         return this;
       }
 
-      private Object name_ = "";
+      private java.lang.Object name_ = "";
       /**
        *
        *
@@ -749,15 +773,15 @@ public Builder mergeFrom(
        *
        * @return The name.
        */
-      public String getName() {
-        Object ref = name_;
-        if (!(ref instanceof String)) {
+      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;
-          String s = bs.toStringUtf8();
+          java.lang.String s = bs.toStringUtf8();
           name_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -778,10 +802,10 @@ public String getName() {
        * @return The bytes for name.
        */
       public com.google.protobuf.ByteString getNameBytes() {
-        Object ref = name_;
+        java.lang.Object ref = name_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
           name_ = b;
           return b;
         } else {
@@ -806,7 +830,7 @@ public com.google.protobuf.ByteString getNameBytes() {
        * @param value The name to set.
        * @return This builder for chaining.
        */
-      public Builder setName(String value) {
+      public Builder setName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -867,8 +891,11 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         return this;
       }
 
-      private Type type_;
-      private com.google.protobuf.SingleFieldBuilderV3
+      private com.google.spanner.v1.Type type_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.spanner.v1.Type,
+              com.google.spanner.v1.Type.Builder,
+              com.google.spanner.v1.TypeOrBuilder>
           typeBuilder_;
       /**
        *
@@ -895,9 +922,9 @@ public boolean hasType() {
        *
        * @return The type.
        */
-      public Type getType() {
+      public com.google.spanner.v1.Type getType() {
         if (typeBuilder_ == null) {
-          return type_ == null ? Type.getDefaultInstance() : type_;
+          return type_ == null ? com.google.spanner.v1.Type.getDefaultInstance() : type_;
         } else {
           return typeBuilder_.getMessage();
         }
@@ -911,7 +938,7 @@ public Type getType() {
        *
        * .google.spanner.v1.Type type = 2;
        */
-      public Builder setType(Type value) {
+      public Builder setType(com.google.spanner.v1.Type value) {
         if (typeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -933,7 +960,7 @@ public Builder setType(Type value) {
        *
        * .google.spanner.v1.Type type = 2;
        */
-      public Builder setType(Type.Builder builderForValue) {
+      public Builder setType(com.google.spanner.v1.Type.Builder builderForValue) {
         if (typeBuilder_ == null) {
           type_ = builderForValue.build();
           onChanged();
@@ -952,10 +979,10 @@ public Builder setType(Type.Builder builderForValue) {
        *
        * .google.spanner.v1.Type type = 2;
        */
-      public Builder mergeType(Type value) {
+      public Builder mergeType(com.google.spanner.v1.Type value) {
         if (typeBuilder_ == null) {
           if (type_ != null) {
-            type_ = Type.newBuilder(type_).mergeFrom(value).buildPartial();
+            type_ = com.google.spanner.v1.Type.newBuilder(type_).mergeFrom(value).buildPartial();
           } else {
             type_ = value;
           }
@@ -995,7 +1022,7 @@ public Builder clearType() {
        *
        * .google.spanner.v1.Type type = 2;
        */
-      public Type.Builder getTypeBuilder() {
+      public com.google.spanner.v1.Type.Builder getTypeBuilder() {
 
         onChanged();
         return getTypeFieldBuilder().getBuilder();
@@ -1009,11 +1036,11 @@ public Type.Builder getTypeBuilder() {
        *
        * .google.spanner.v1.Type type = 2;
        */
-      public TypeOrBuilder getTypeOrBuilder() {
+      public com.google.spanner.v1.TypeOrBuilder getTypeOrBuilder() {
         if (typeBuilder_ != null) {
           return typeBuilder_.getMessageOrBuilder();
         } else {
-          return type_ == null ? Type.getDefaultInstance() : type_;
+          return type_ == null ? com.google.spanner.v1.Type.getDefaultInstance() : type_;
         }
       }
       /**
@@ -1025,24 +1052,30 @@ public TypeOrBuilder getTypeOrBuilder() {
        *
        * .google.spanner.v1.Type type = 2;
        */
-      private com.google.protobuf.SingleFieldBuilderV3
+      private com.google.protobuf.SingleFieldBuilderV3<
+              com.google.spanner.v1.Type,
+              com.google.spanner.v1.Type.Builder,
+              com.google.spanner.v1.TypeOrBuilder>
           getTypeFieldBuilder() {
         if (typeBuilder_ == null) {
           typeBuilder_ =
-              new com.google.protobuf.SingleFieldBuilderV3(
+              new com.google.protobuf.SingleFieldBuilderV3<
+                  com.google.spanner.v1.Type,
+                  com.google.spanner.v1.Type.Builder,
+                  com.google.spanner.v1.TypeOrBuilder>(
                   getType(), getParentForChildren(), isClean());
           type_ = null;
         }
         return typeBuilder_;
       }
 
-      @Override
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @Override
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1052,19 +1085,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.StructType.Field)
-    private static final Field DEFAULT_INSTANCE;
+    private static final com.google.spanner.v1.StructType.Field DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new Field();
+      DEFAULT_INSTANCE = new com.google.spanner.v1.StructType.Field();
     }
 
-    public static Field getDefaultInstance() {
+    public static com.google.spanner.v1.StructType.Field getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @Override
+          @java.lang.Override
           public Field parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1077,19 +1110,19 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @Override
-    public Field getDefaultInstanceForType() {
+    @java.lang.Override
+    public com.google.spanner.v1.StructType.Field getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
 
   public static final int FIELDS_FIELD_NUMBER = 1;
-  private java.util.List fields_;
+  private java.util.List fields_;
   /**
    *
    *
@@ -1104,8 +1137,8 @@ public Field getDefaultInstanceForType() {
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  @Override
-  public java.util.List getFieldsList() {
+  @java.lang.Override
+  public java.util.List getFieldsList() {
     return fields_;
   }
   /**
@@ -1122,8 +1155,9 @@ public java.util.List getFieldsList() {
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  @Override
-  public java.util.List getFieldsOrBuilderList() {
+  @java.lang.Override
+  public java.util.List
+      getFieldsOrBuilderList() {
     return fields_;
   }
   /**
@@ -1140,7 +1174,7 @@ public java.util.List getFieldsOrBuilderList() {
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  @Override
+  @java.lang.Override
   public int getFieldsCount() {
     return fields_.size();
   }
@@ -1158,8 +1192,8 @@ public int getFieldsCount() {
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  @Override
-  public Field getFields(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.StructType.Field getFields(int index) {
     return fields_.get(index);
   }
   /**
@@ -1176,14 +1210,14 @@ public Field getFields(int index) {
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  @Override
-  public FieldOrBuilder getFieldsOrBuilder(int index) {
+  @java.lang.Override
+  public com.google.spanner.v1.StructType.FieldOrBuilder getFieldsOrBuilder(int index) {
     return fields_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1193,7 +1227,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   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));
@@ -1201,7 +1235,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1215,22 +1249,22 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof StructType)) {
+    if (!(obj instanceof com.google.spanner.v1.StructType)) {
       return super.equals(obj);
     }
-    StructType other = (StructType) obj;
+    com.google.spanner.v1.StructType other = (com.google.spanner.v1.StructType) obj;
 
     if (!getFieldsList().equals(other.getFieldsList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -1246,69 +1280,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static StructType parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.StructType parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static StructType parseFrom(
+  public static com.google.spanner.v1.StructType parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static StructType parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.StructType parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static StructType parseFrom(
+  public static com.google.spanner.v1.StructType parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static StructType parseFrom(byte[] data)
+  public static com.google.spanner.v1.StructType parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static StructType parseFrom(
+  public static com.google.spanner.v1.StructType parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static StructType parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.StructType parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static StructType parseFrom(
+  public static com.google.spanner.v1.StructType 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 StructType parseDelimitedFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.StructType parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static StructType parseDelimitedFrom(
+  public static com.google.spanner.v1.StructType 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 StructType parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.StructType parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static StructType parseFrom(
+  public static com.google.spanner.v1.StructType parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -1316,7 +1351,7 @@ public static StructType parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -1325,17 +1360,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(StructType prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.StructType prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -1351,15 +1386,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.StructType)
-      StructTypeOrBuilder {
+      com.google.spanner.v1.StructTypeOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return TypeProto.internal_static_google_spanner_v1_StructType_descriptor;
+      return com.google.spanner.v1.TypeProto
+          .internal_static_google_spanner_v1_StructType_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return TypeProto.internal_static_google_spanner_v1_StructType_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(StructType.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.TypeProto
+          .internal_static_google_spanner_v1_StructType_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.StructType.class,
+              com.google.spanner.v1.StructType.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.StructType.newBuilder()
@@ -1367,7 +1407,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -1378,7 +1418,7 @@ private void maybeForceBuilderInitialization() {
       }
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (fieldsBuilder_ == null) {
@@ -1390,28 +1430,29 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return TypeProto.internal_static_google_spanner_v1_StructType_descriptor;
+      return com.google.spanner.v1.TypeProto
+          .internal_static_google_spanner_v1_StructType_descriptor;
     }
 
-    @Override
-    public StructType getDefaultInstanceForType() {
-      return StructType.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.StructType getDefaultInstanceForType() {
+      return com.google.spanner.v1.StructType.getDefaultInstance();
     }
 
-    @Override
-    public StructType build() {
-      StructType result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.StructType build() {
+      com.google.spanner.v1.StructType result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public StructType buildPartial() {
-      StructType result = new StructType(this);
+    @java.lang.Override
+    public com.google.spanner.v1.StructType buildPartial() {
+      com.google.spanner.v1.StructType result = new com.google.spanner.v1.StructType(this);
       int from_bitField0_ = bitField0_;
       if (fieldsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -1426,50 +1467,51 @@ public StructType buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof StructType) {
-        return mergeFrom((StructType) other);
+      if (other instanceof com.google.spanner.v1.StructType) {
+        return mergeFrom((com.google.spanner.v1.StructType) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(StructType other) {
-      if (other == StructType.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.StructType other) {
+      if (other == com.google.spanner.v1.StructType.getDefaultInstance()) return this;
       if (fieldsBuilder_ == null) {
         if (!other.fields_.isEmpty()) {
           if (fields_.isEmpty()) {
@@ -1502,21 +1544,21 @@ public Builder mergeFrom(StructType other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      StructType parsedMessage = null;
+      com.google.spanner.v1.StructType parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (StructType) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.StructType) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -1528,16 +1570,20 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private java.util.List fields_ = java.util.Collections.emptyList();
+    private java.util.List fields_ =
+        java.util.Collections.emptyList();
 
     private void ensureFieldsIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        fields_ = new java.util.ArrayList(fields_);
+        fields_ = new java.util.ArrayList(fields_);
         bitField0_ |= 0x00000001;
       }
     }
 
-    private com.google.protobuf.RepeatedFieldBuilderV3
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.spanner.v1.StructType.Field,
+            com.google.spanner.v1.StructType.Field.Builder,
+            com.google.spanner.v1.StructType.FieldOrBuilder>
         fieldsBuilder_;
 
     /**
@@ -1554,7 +1600,7 @@ private void ensureFieldsIsMutable() {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public java.util.List getFieldsList() {
+    public java.util.List getFieldsList() {
       if (fieldsBuilder_ == null) {
         return java.util.Collections.unmodifiableList(fields_);
       } else {
@@ -1596,7 +1642,7 @@ public int getFieldsCount() {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Field getFields(int index) {
+    public com.google.spanner.v1.StructType.Field getFields(int index) {
       if (fieldsBuilder_ == null) {
         return fields_.get(index);
       } else {
@@ -1617,7 +1663,7 @@ public Field getFields(int index) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder setFields(int index, Field value) {
+    public Builder setFields(int index, com.google.spanner.v1.StructType.Field value) {
       if (fieldsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1644,7 +1690,8 @@ public Builder setFields(int index, Field value) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder setFields(int index, Field.Builder builderForValue) {
+    public Builder setFields(
+        int index, com.google.spanner.v1.StructType.Field.Builder builderForValue) {
       if (fieldsBuilder_ == null) {
         ensureFieldsIsMutable();
         fields_.set(index, builderForValue.build());
@@ -1668,7 +1715,7 @@ public Builder setFields(int index, Field.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder addFields(Field value) {
+    public Builder addFields(com.google.spanner.v1.StructType.Field value) {
       if (fieldsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1695,7 +1742,7 @@ public Builder addFields(Field value) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder addFields(int index, Field value) {
+    public Builder addFields(int index, com.google.spanner.v1.StructType.Field value) {
       if (fieldsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1722,7 +1769,7 @@ public Builder addFields(int index, Field value) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder addFields(Field.Builder builderForValue) {
+    public Builder addFields(com.google.spanner.v1.StructType.Field.Builder builderForValue) {
       if (fieldsBuilder_ == null) {
         ensureFieldsIsMutable();
         fields_.add(builderForValue.build());
@@ -1746,7 +1793,8 @@ public Builder addFields(Field.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder addFields(int index, Field.Builder builderForValue) {
+    public Builder addFields(
+        int index, com.google.spanner.v1.StructType.Field.Builder builderForValue) {
       if (fieldsBuilder_ == null) {
         ensureFieldsIsMutable();
         fields_.add(index, builderForValue.build());
@@ -1770,7 +1818,8 @@ public Builder addFields(int index, Field.Builder builderForValue) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Builder addAllFields(Iterable values) {
+    public Builder addAllFields(
+        java.lang.Iterable values) {
       if (fieldsBuilder_ == null) {
         ensureFieldsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, fields_);
@@ -1842,7 +1891,7 @@ public Builder removeFields(int index) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Field.Builder getFieldsBuilder(int index) {
+    public com.google.spanner.v1.StructType.Field.Builder getFieldsBuilder(int index) {
       return getFieldsFieldBuilder().getBuilder(index);
     }
     /**
@@ -1859,7 +1908,7 @@ public Field.Builder getFieldsBuilder(int index) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public FieldOrBuilder getFieldsOrBuilder(int index) {
+    public com.google.spanner.v1.StructType.FieldOrBuilder getFieldsOrBuilder(int index) {
       if (fieldsBuilder_ == null) {
         return fields_.get(index);
       } else {
@@ -1880,7 +1929,8 @@ public FieldOrBuilder getFieldsOrBuilder(int index) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public java.util.List getFieldsOrBuilderList() {
+    public java.util.List
+        getFieldsOrBuilderList() {
       if (fieldsBuilder_ != null) {
         return fieldsBuilder_.getMessageOrBuilderList();
       } else {
@@ -1901,8 +1951,9 @@ public java.util.List getFieldsOrBuilderList() {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Field.Builder addFieldsBuilder() {
-      return getFieldsFieldBuilder().addBuilder(Field.getDefaultInstance());
+    public com.google.spanner.v1.StructType.Field.Builder addFieldsBuilder() {
+      return getFieldsFieldBuilder()
+          .addBuilder(com.google.spanner.v1.StructType.Field.getDefaultInstance());
     }
     /**
      *
@@ -1918,8 +1969,9 @@ public Field.Builder addFieldsBuilder() {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public Field.Builder addFieldsBuilder(int index) {
-      return getFieldsFieldBuilder().addBuilder(index, Field.getDefaultInstance());
+    public com.google.spanner.v1.StructType.Field.Builder addFieldsBuilder(int index) {
+      return getFieldsFieldBuilder()
+          .addBuilder(index, com.google.spanner.v1.StructType.Field.getDefaultInstance());
     }
     /**
      *
@@ -1935,27 +1987,33 @@ public Field.Builder addFieldsBuilder(int index) {
      *
      * repeated .google.spanner.v1.StructType.Field fields = 1;
      */
-    public java.util.List getFieldsBuilderList() {
+    public java.util.List getFieldsBuilderList() {
       return getFieldsFieldBuilder().getBuilderList();
     }
 
-    private com.google.protobuf.RepeatedFieldBuilderV3
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.spanner.v1.StructType.Field,
+            com.google.spanner.v1.StructType.Field.Builder,
+            com.google.spanner.v1.StructType.FieldOrBuilder>
         getFieldsFieldBuilder() {
       if (fieldsBuilder_ == null) {
         fieldsBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3(
+            new com.google.protobuf.RepeatedFieldBuilderV3<
+                com.google.spanner.v1.StructType.Field,
+                com.google.spanner.v1.StructType.Field.Builder,
+                com.google.spanner.v1.StructType.FieldOrBuilder>(
                 fields_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         fields_ = null;
       }
       return fieldsBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1965,19 +2023,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.StructType)
-  private static final StructType DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.StructType DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new StructType();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.StructType();
   }
 
-  public static StructType getDefaultInstance() {
+  public static com.google.spanner.v1.StructType getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public StructType parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1990,13 +2048,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public StructType getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.StructType getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructTypeOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructTypeOrBuilder.java
index 2c1e88bd75..97d70e9b0d 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructTypeOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructTypeOrBuilder.java
@@ -37,7 +37,7 @@ public interface StructTypeOrBuilder
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  java.util.List getFieldsList();
+  java.util.List getFieldsList();
   /**
    *
    *
@@ -52,7 +52,7 @@ public interface StructTypeOrBuilder
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  StructType.Field getFields(int index);
+  com.google.spanner.v1.StructType.Field getFields(int index);
   /**
    *
    *
@@ -82,7 +82,8 @@ public interface StructTypeOrBuilder
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  java.util.List getFieldsOrBuilderList();
+  java.util.List
+      getFieldsOrBuilderList();
   /**
    *
    *
@@ -97,5 +98,5 @@ public interface StructTypeOrBuilder
    *
    * repeated .google.spanner.v1.StructType.Field fields = 1;
    */
-  StructType.FieldOrBuilder getFieldsOrBuilder(int index);
+  com.google.spanner.v1.StructType.FieldOrBuilder getFieldsOrBuilder(int index);
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java
index 64845fae5d..be57d6c504 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java
@@ -41,13 +41,13 @@ private Transaction() {
     id_ = com.google.protobuf.ByteString.EMPTY;
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Transaction();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -58,7 +58,7 @@ private Transaction(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -110,13 +110,18 @@ private Transaction(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return TransactionProto.internal_static_google_spanner_v1_Transaction_descriptor;
+    return com.google.spanner.v1.TransactionProto
+        .internal_static_google_spanner_v1_Transaction_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return TransactionProto.internal_static_google_spanner_v1_Transaction_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(Transaction.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.TransactionProto
+        .internal_static_google_spanner_v1_Transaction_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.Transaction.class,
+            com.google.spanner.v1.Transaction.Builder.class);
   }
 
   public static final int ID_FIELD_NUMBER = 1;
@@ -138,7 +143,7 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return The id.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getId() {
     return id_;
   }
@@ -160,7 +165,7 @@ public com.google.protobuf.ByteString getId() {
    *
    * @return Whether the readTimestamp field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasReadTimestamp() {
     return readTimestamp_ != null;
   }
@@ -179,7 +184,7 @@ public boolean hasReadTimestamp() {
    *
    * @return The readTimestamp.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Timestamp getReadTimestamp() {
     return readTimestamp_ == null
         ? com.google.protobuf.Timestamp.getDefaultInstance()
@@ -198,14 +203,14 @@ public com.google.protobuf.Timestamp getReadTimestamp() {
    *
    * .google.protobuf.Timestamp read_timestamp = 2;
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
     return getReadTimestamp();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -215,7 +220,7 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (!id_.isEmpty()) {
       output.writeBytes(1, id_);
@@ -226,7 +231,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -243,15 +248,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof Transaction)) {
+    if (!(obj instanceof com.google.spanner.v1.Transaction)) {
       return super.equals(obj);
     }
-    Transaction other = (Transaction) obj;
+    com.google.spanner.v1.Transaction other = (com.google.spanner.v1.Transaction) obj;
 
     if (!getId().equals(other.getId())) return false;
     if (hasReadTimestamp() != other.hasReadTimestamp()) return false;
@@ -262,7 +267,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -280,69 +285,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static Transaction parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.Transaction parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Transaction parseFrom(
+  public static com.google.spanner.v1.Transaction parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Transaction parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.Transaction parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Transaction parseFrom(
+  public static com.google.spanner.v1.Transaction parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Transaction parseFrom(byte[] data)
+  public static com.google.spanner.v1.Transaction parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Transaction parseFrom(
+  public static com.google.spanner.v1.Transaction parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Transaction parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.Transaction parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static Transaction parseFrom(
+  public static com.google.spanner.v1.Transaction 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 Transaction parseDelimitedFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.Transaction parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static Transaction parseDelimitedFrom(
+  public static com.google.spanner.v1.Transaction 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 Transaction parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.Transaction parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static Transaction parseFrom(
+  public static com.google.spanner.v1.Transaction parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -350,7 +356,7 @@ public static Transaction parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -359,17 +365,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(Transaction prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.Transaction prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -385,15 +391,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.Transaction)
-      TransactionOrBuilder {
+      com.google.spanner.v1.TransactionOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return TransactionProto.internal_static_google_spanner_v1_Transaction_descriptor;
+      return com.google.spanner.v1.TransactionProto
+          .internal_static_google_spanner_v1_Transaction_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return TransactionProto.internal_static_google_spanner_v1_Transaction_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(Transaction.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.TransactionProto
+          .internal_static_google_spanner_v1_Transaction_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.Transaction.class,
+              com.google.spanner.v1.Transaction.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.Transaction.newBuilder()
@@ -401,7 +412,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -410,7 +421,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       id_ = com.google.protobuf.ByteString.EMPTY;
@@ -424,28 +435,29 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return TransactionProto.internal_static_google_spanner_v1_Transaction_descriptor;
+      return com.google.spanner.v1.TransactionProto
+          .internal_static_google_spanner_v1_Transaction_descriptor;
     }
 
-    @Override
-    public Transaction getDefaultInstanceForType() {
-      return Transaction.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.Transaction getDefaultInstanceForType() {
+      return com.google.spanner.v1.Transaction.getDefaultInstance();
     }
 
-    @Override
-    public Transaction build() {
-      Transaction result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.Transaction build() {
+      com.google.spanner.v1.Transaction result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public Transaction buildPartial() {
-      Transaction result = new Transaction(this);
+    @java.lang.Override
+    public com.google.spanner.v1.Transaction buildPartial() {
+      com.google.spanner.v1.Transaction result = new com.google.spanner.v1.Transaction(this);
       result.id_ = id_;
       if (readTimestampBuilder_ == null) {
         result.readTimestamp_ = readTimestamp_;
@@ -456,50 +468,51 @@ public Transaction buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof Transaction) {
-        return mergeFrom((Transaction) other);
+      if (other instanceof com.google.spanner.v1.Transaction) {
+        return mergeFrom((com.google.spanner.v1.Transaction) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(Transaction other) {
-      if (other == Transaction.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.Transaction other) {
+      if (other == com.google.spanner.v1.Transaction.getDefaultInstance()) return this;
       if (other.getId() != com.google.protobuf.ByteString.EMPTY) {
         setId(other.getId());
       }
@@ -511,21 +524,21 @@ public Builder mergeFrom(Transaction other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Transaction parsedMessage = null;
+      com.google.spanner.v1.Transaction parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (Transaction) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.Transaction) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -553,7 +566,7 @@ public Builder mergeFrom(
      *
      * @return The id.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.ByteString getId() {
       return id_;
     }
@@ -829,12 +842,12 @@ public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
       return readTimestampBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -844,19 +857,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.Transaction)
-  private static final Transaction DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.Transaction DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new Transaction();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.Transaction();
   }
 
-  public static Transaction getDefaultInstance() {
+  public static com.google.spanner.v1.Transaction getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public Transaction parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -869,13 +882,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public Transaction getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.Transaction getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java
index c04885b2b7..3c4cba6827 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java
@@ -254,13 +254,13 @@ private TransactionOptions(com.google.protobuf.GeneratedMessageV3.Builder bui
 
   private TransactionOptions() {}
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new TransactionOptions();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -271,7 +271,7 @@ private TransactionOptions(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -285,13 +285,17 @@ private TransactionOptions(
             break;
           case 10:
             {
-              ReadWrite.Builder subBuilder = null;
+              com.google.spanner.v1.TransactionOptions.ReadWrite.Builder subBuilder = null;
               if (modeCase_ == 1) {
-                subBuilder = ((ReadWrite) mode_).toBuilder();
+                subBuilder =
+                    ((com.google.spanner.v1.TransactionOptions.ReadWrite) mode_).toBuilder();
               }
-              mode_ = input.readMessage(ReadWrite.parser(), extensionRegistry);
+              mode_ =
+                  input.readMessage(
+                      com.google.spanner.v1.TransactionOptions.ReadWrite.parser(),
+                      extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((ReadWrite) mode_);
+                subBuilder.mergeFrom((com.google.spanner.v1.TransactionOptions.ReadWrite) mode_);
                 mode_ = subBuilder.buildPartial();
               }
               modeCase_ = 1;
@@ -299,13 +303,17 @@ private TransactionOptions(
             }
           case 18:
             {
-              ReadOnly.Builder subBuilder = null;
+              com.google.spanner.v1.TransactionOptions.ReadOnly.Builder subBuilder = null;
               if (modeCase_ == 2) {
-                subBuilder = ((ReadOnly) mode_).toBuilder();
+                subBuilder =
+                    ((com.google.spanner.v1.TransactionOptions.ReadOnly) mode_).toBuilder();
               }
-              mode_ = input.readMessage(ReadOnly.parser(), extensionRegistry);
+              mode_ =
+                  input.readMessage(
+                      com.google.spanner.v1.TransactionOptions.ReadOnly.parser(),
+                      extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((ReadOnly) mode_);
+                subBuilder.mergeFrom((com.google.spanner.v1.TransactionOptions.ReadOnly) mode_);
                 mode_ = subBuilder.buildPartial();
               }
               modeCase_ = 2;
@@ -313,13 +321,18 @@ private TransactionOptions(
             }
           case 26:
             {
-              PartitionedDml.Builder subBuilder = null;
+              com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder subBuilder = null;
               if (modeCase_ == 3) {
-                subBuilder = ((PartitionedDml) mode_).toBuilder();
+                subBuilder =
+                    ((com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_).toBuilder();
               }
-              mode_ = input.readMessage(PartitionedDml.parser(), extensionRegistry);
+              mode_ =
+                  input.readMessage(
+                      com.google.spanner.v1.TransactionOptions.PartitionedDml.parser(),
+                      extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((PartitionedDml) mode_);
+                subBuilder.mergeFrom(
+                    (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_);
                 mode_ = subBuilder.buildPartial();
               }
               modeCase_ = 3;
@@ -345,13 +358,18 @@ private TransactionOptions(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return TransactionProto.internal_static_google_spanner_v1_TransactionOptions_descriptor;
+    return com.google.spanner.v1.TransactionProto
+        .internal_static_google_spanner_v1_TransactionOptions_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return TransactionProto.internal_static_google_spanner_v1_TransactionOptions_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(TransactionOptions.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.TransactionProto
+        .internal_static_google_spanner_v1_TransactionOptions_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.TransactionOptions.class,
+            com.google.spanner.v1.TransactionOptions.Builder.class);
   }
 
   public interface ReadWriteOrBuilder
@@ -380,13 +398,13 @@ private ReadWrite(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
     private ReadWrite() {}
 
-    @Override
+    @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new ReadWrite();
     }
 
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -397,7 +415,7 @@ private ReadWrite(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -429,20 +447,23 @@ private ReadWrite(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return TransactionProto
+      return com.google.spanner.v1.TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_ReadWrite_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return TransactionProto
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_ReadWrite_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(ReadWrite.class, Builder.class);
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.TransactionOptions.ReadWrite.class,
+              com.google.spanner.v1.TransactionOptions.ReadWrite.Builder.class);
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -452,12 +473,12 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       unknownFields.writeTo(output);
     }
 
-    @Override
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -468,21 +489,22 @@ public int getSerializedSize() {
       return size;
     }
 
-    @Override
-    public boolean equals(final Object obj) {
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof ReadWrite)) {
+      if (!(obj instanceof com.google.spanner.v1.TransactionOptions.ReadWrite)) {
         return super.equals(obj);
       }
-      ReadWrite other = (ReadWrite) obj;
+      com.google.spanner.v1.TransactionOptions.ReadWrite other =
+          (com.google.spanner.v1.TransactionOptions.ReadWrite) obj;
 
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -494,69 +516,71 @@ public int hashCode() {
       return hash;
     }
 
-    public static ReadWrite parseFrom(java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
+        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static ReadWrite parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static ReadWrite parseFrom(com.google.protobuf.ByteString data)
+    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
+        com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static ReadWrite parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static ReadWrite parseFrom(byte[] data)
+    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static ReadWrite parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static ReadWrite parseFrom(java.io.InputStream input) throws java.io.IOException {
+    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
+        java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static ReadWrite parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.ReadWrite 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 ReadWrite parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseDelimitedFrom(
+        java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static ReadWrite parseDelimitedFrom(
+    public static com.google.spanner.v1.TransactionOptions.ReadWrite 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 ReadWrite parseFrom(com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static ReadWrite parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -564,7 +588,7 @@ public static ReadWrite parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @Override
+    @java.lang.Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -573,17 +597,18 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(ReadWrite prototype) {
+    public static Builder newBuilder(com.google.spanner.v1.TransactionOptions.ReadWrite prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @Override
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
     }
 
-    @Override
-    protected Builder newBuilderForType(BuilderParent parent) {
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -601,17 +626,20 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.TransactionOptions.ReadWrite)
-        ReadWriteOrBuilder {
+        com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return TransactionProto
+        return com.google.spanner.v1.TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_ReadWrite_descriptor;
       }
 
-      @Override
-      protected FieldAccessorTable internalGetFieldAccessorTable() {
-        return TransactionProto
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.spanner.v1.TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_ReadWrite_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(ReadWrite.class, Builder.class);
+            .ensureFieldAccessorsInitialized(
+                com.google.spanner.v1.TransactionOptions.ReadWrite.class,
+                com.google.spanner.v1.TransactionOptions.ReadWrite.Builder.class);
       }
 
       // Construct using com.google.spanner.v1.TransactionOptions.ReadWrite.newBuilder()
@@ -619,7 +647,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -628,103 +656,109 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @Override
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return TransactionProto
+        return com.google.spanner.v1.TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_ReadWrite_descriptor;
       }
 
-      @Override
-      public ReadWrite getDefaultInstanceForType() {
-        return ReadWrite.getDefaultInstance();
+      @java.lang.Override
+      public com.google.spanner.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() {
+        return com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
       }
 
-      @Override
-      public ReadWrite build() {
-        ReadWrite result = buildPartial();
+      @java.lang.Override
+      public com.google.spanner.v1.TransactionOptions.ReadWrite build() {
+        com.google.spanner.v1.TransactionOptions.ReadWrite result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @Override
-      public ReadWrite buildPartial() {
-        ReadWrite result = new ReadWrite(this);
+      @java.lang.Override
+      public com.google.spanner.v1.TransactionOptions.ReadWrite buildPartial() {
+        com.google.spanner.v1.TransactionOptions.ReadWrite result =
+            new com.google.spanner.v1.TransactionOptions.ReadWrite(this);
         onBuilt();
         return result;
       }
 
-      @Override
+      @java.lang.Override
       public Builder clone() {
         return super.clone();
       }
 
-      @Override
-      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.setField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @Override
+      @java.lang.Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof ReadWrite) {
-          return mergeFrom((ReadWrite) other);
+        if (other instanceof com.google.spanner.v1.TransactionOptions.ReadWrite) {
+          return mergeFrom((com.google.spanner.v1.TransactionOptions.ReadWrite) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(ReadWrite other) {
-        if (other == ReadWrite.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.google.spanner.v1.TransactionOptions.ReadWrite other) {
+        if (other == com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance())
+          return this;
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        ReadWrite parsedMessage = null;
+        com.google.spanner.v1.TransactionOptions.ReadWrite parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (ReadWrite) e.getUnfinishedMessage();
+          parsedMessage =
+              (com.google.spanner.v1.TransactionOptions.ReadWrite) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -734,13 +768,13 @@ public Builder mergeFrom(
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @Override
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -750,19 +784,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.TransactionOptions.ReadWrite)
-    private static final ReadWrite DEFAULT_INSTANCE;
+    private static final com.google.spanner.v1.TransactionOptions.ReadWrite DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new ReadWrite();
+      DEFAULT_INSTANCE = new com.google.spanner.v1.TransactionOptions.ReadWrite();
     }
 
-    public static ReadWrite getDefaultInstance() {
+    public static com.google.spanner.v1.TransactionOptions.ReadWrite getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @Override
+          @java.lang.Override
           public ReadWrite parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -775,13 +809,13 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @Override
-    public ReadWrite getDefaultInstanceForType() {
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
@@ -811,13 +845,13 @@ private PartitionedDml(com.google.protobuf.GeneratedMessageV3.Builder builder
 
     private PartitionedDml() {}
 
-    @Override
+    @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new PartitionedDml();
     }
 
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -828,7 +862,7 @@ private PartitionedDml(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -860,20 +894,23 @@ private PartitionedDml(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return TransactionProto
+      return com.google.spanner.v1.TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return TransactionProto
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(PartitionedDml.class, Builder.class);
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.TransactionOptions.PartitionedDml.class,
+              com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder.class);
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -883,12 +920,12 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       unknownFields.writeTo(output);
     }
 
-    @Override
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -899,21 +936,22 @@ public int getSerializedSize() {
       return size;
     }
 
-    @Override
-    public boolean equals(final Object obj) {
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof PartitionedDml)) {
+      if (!(obj instanceof com.google.spanner.v1.TransactionOptions.PartitionedDml)) {
         return super.equals(obj);
       }
-      PartitionedDml other = (PartitionedDml) obj;
+      com.google.spanner.v1.TransactionOptions.PartitionedDml other =
+          (com.google.spanner.v1.TransactionOptions.PartitionedDml) obj;
 
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -925,69 +963,71 @@ public int hashCode() {
       return hash;
     }
 
-    public static PartitionedDml parseFrom(java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
+        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static PartitionedDml parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static PartitionedDml parseFrom(com.google.protobuf.ByteString data)
+    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
+        com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static PartitionedDml parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static PartitionedDml parseFrom(byte[] data)
+    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static PartitionedDml parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static PartitionedDml parseFrom(java.io.InputStream input) throws java.io.IOException {
+    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
+        java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static PartitionedDml parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.PartitionedDml 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 PartitionedDml parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseDelimitedFrom(
+        java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static PartitionedDml parseDelimitedFrom(
+    public static com.google.spanner.v1.TransactionOptions.PartitionedDml 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 PartitionedDml parseFrom(com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static PartitionedDml parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.PartitionedDml parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -995,7 +1035,7 @@ public static PartitionedDml parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @Override
+    @java.lang.Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -1004,17 +1044,19 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(PartitionedDml prototype) {
+    public static Builder newBuilder(
+        com.google.spanner.v1.TransactionOptions.PartitionedDml prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @Override
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
     }
 
-    @Override
-    protected Builder newBuilderForType(BuilderParent parent) {
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1031,17 +1073,20 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.TransactionOptions.PartitionedDml)
-        PartitionedDmlOrBuilder {
+        com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return TransactionProto
+        return com.google.spanner.v1.TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_descriptor;
       }
 
-      @Override
-      protected FieldAccessorTable internalGetFieldAccessorTable() {
-        return TransactionProto
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.spanner.v1.TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(PartitionedDml.class, Builder.class);
+            .ensureFieldAccessorsInitialized(
+                com.google.spanner.v1.TransactionOptions.PartitionedDml.class,
+                com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder.class);
       }
 
       // Construct using com.google.spanner.v1.TransactionOptions.PartitionedDml.newBuilder()
@@ -1049,7 +1094,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -1058,103 +1103,109 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @Override
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return TransactionProto
+        return com.google.spanner.v1.TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_descriptor;
       }
 
-      @Override
-      public PartitionedDml getDefaultInstanceForType() {
-        return PartitionedDml.getDefaultInstance();
+      @java.lang.Override
+      public com.google.spanner.v1.TransactionOptions.PartitionedDml getDefaultInstanceForType() {
+        return com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
       }
 
-      @Override
-      public PartitionedDml build() {
-        PartitionedDml result = buildPartial();
+      @java.lang.Override
+      public com.google.spanner.v1.TransactionOptions.PartitionedDml build() {
+        com.google.spanner.v1.TransactionOptions.PartitionedDml result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @Override
-      public PartitionedDml buildPartial() {
-        PartitionedDml result = new PartitionedDml(this);
+      @java.lang.Override
+      public com.google.spanner.v1.TransactionOptions.PartitionedDml buildPartial() {
+        com.google.spanner.v1.TransactionOptions.PartitionedDml result =
+            new com.google.spanner.v1.TransactionOptions.PartitionedDml(this);
         onBuilt();
         return result;
       }
 
-      @Override
+      @java.lang.Override
       public Builder clone() {
         return super.clone();
       }
 
-      @Override
-      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.setField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @Override
+      @java.lang.Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof PartitionedDml) {
-          return mergeFrom((PartitionedDml) other);
+        if (other instanceof com.google.spanner.v1.TransactionOptions.PartitionedDml) {
+          return mergeFrom((com.google.spanner.v1.TransactionOptions.PartitionedDml) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(PartitionedDml other) {
-        if (other == PartitionedDml.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.google.spanner.v1.TransactionOptions.PartitionedDml other) {
+        if (other == com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance())
+          return this;
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        PartitionedDml parsedMessage = null;
+        com.google.spanner.v1.TransactionOptions.PartitionedDml parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (PartitionedDml) e.getUnfinishedMessage();
+          parsedMessage =
+              (com.google.spanner.v1.TransactionOptions.PartitionedDml) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1164,13 +1215,13 @@ public Builder mergeFrom(
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @Override
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1180,19 +1231,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.TransactionOptions.PartitionedDml)
-    private static final PartitionedDml DEFAULT_INSTANCE;
+    private static final com.google.spanner.v1.TransactionOptions.PartitionedDml DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new PartitionedDml();
+      DEFAULT_INSTANCE = new com.google.spanner.v1.TransactionOptions.PartitionedDml();
     }
 
-    public static PartitionedDml getDefaultInstance() {
+    public static com.google.spanner.v1.TransactionOptions.PartitionedDml getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @Override
+          @java.lang.Override
           public PartitionedDml parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1205,13 +1256,13 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @Override
-    public PartitionedDml getDefaultInstanceForType() {
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions.PartitionedDml getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
@@ -1501,7 +1552,8 @@ public interface ReadOnlyOrBuilder
      */
     boolean getReturnReadTimestamp();
 
-    public ReadOnly.TimestampBoundCase getTimestampBoundCase();
+    public com.google.spanner.v1.TransactionOptions.ReadOnly.TimestampBoundCase
+        getTimestampBoundCase();
   }
   /**
    *
@@ -1524,13 +1576,13 @@ private ReadOnly(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
     private ReadOnly() {}
 
-    @Override
+    @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new ReadOnly();
     }
 
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
@@ -1541,7 +1593,7 @@ private ReadOnly(
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1644,22 +1696,27 @@ private ReadOnly(
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return TransactionProto
+      return com.google.spanner.v1.TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_ReadOnly_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return TransactionProto
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_ReadOnly_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(ReadOnly.class, Builder.class);
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.TransactionOptions.ReadOnly.class,
+              com.google.spanner.v1.TransactionOptions.ReadOnly.Builder.class);
     }
 
     private int timestampBoundCase_ = 0;
-    private Object timestampBound_;
+    private java.lang.Object timestampBound_;
 
     public enum TimestampBoundCase
-        implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
+        implements
+            com.google.protobuf.Internal.EnumLite,
+            com.google.protobuf.AbstractMessage.InternalOneOfEnum {
       STRONG(1),
       MIN_READ_TIMESTAMP(2),
       MAX_STALENESS(3),
@@ -1676,7 +1733,7 @@ private TimestampBoundCase(int value) {
        * @return The enum associated with the given number.
        * @deprecated Use {@link #forNumber(int)} instead.
        */
-      @Deprecated
+      @java.lang.Deprecated
       public static TimestampBoundCase valueOf(int value) {
         return forNumber(value);
       }
@@ -1738,10 +1795,10 @@ public boolean hasStrong() {
      *
      * @return The strong.
      */
-    @Override
+    @java.lang.Override
     public boolean getStrong() {
       if (timestampBoundCase_ == 1) {
-        return (Boolean) timestampBound_;
+        return (java.lang.Boolean) timestampBound_;
       }
       return false;
     }
@@ -1764,7 +1821,7 @@ public boolean getStrong() {
      *
      * @return Whether the minReadTimestamp field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasMinReadTimestamp() {
       return timestampBoundCase_ == 2;
     }
@@ -1785,7 +1842,7 @@ public boolean hasMinReadTimestamp() {
      *
      * @return The minReadTimestamp.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Timestamp getMinReadTimestamp() {
       if (timestampBoundCase_ == 2) {
         return (com.google.protobuf.Timestamp) timestampBound_;
@@ -1807,7 +1864,7 @@ public com.google.protobuf.Timestamp getMinReadTimestamp() {
      *
      * .google.protobuf.Timestamp min_read_timestamp = 2;
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getMinReadTimestampOrBuilder() {
       if (timestampBoundCase_ == 2) {
         return (com.google.protobuf.Timestamp) timestampBound_;
@@ -1837,7 +1894,7 @@ public com.google.protobuf.TimestampOrBuilder getMinReadTimestampOrBuilder() {
      *
      * @return Whether the maxStaleness field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasMaxStaleness() {
       return timestampBoundCase_ == 3;
     }
@@ -1862,7 +1919,7 @@ public boolean hasMaxStaleness() {
      *
      * @return The maxStaleness.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Duration getMaxStaleness() {
       if (timestampBoundCase_ == 3) {
         return (com.google.protobuf.Duration) timestampBound_;
@@ -1888,7 +1945,7 @@ public com.google.protobuf.Duration getMaxStaleness() {
      *
      * .google.protobuf.Duration max_staleness = 3;
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getMaxStalenessOrBuilder() {
       if (timestampBoundCase_ == 3) {
         return (com.google.protobuf.Duration) timestampBound_;
@@ -1917,7 +1974,7 @@ public com.google.protobuf.DurationOrBuilder getMaxStalenessOrBuilder() {
      *
      * @return Whether the readTimestamp field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasReadTimestamp() {
       return timestampBoundCase_ == 4;
     }
@@ -1941,7 +1998,7 @@ public boolean hasReadTimestamp() {
      *
      * @return The readTimestamp.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Timestamp getReadTimestamp() {
       if (timestampBoundCase_ == 4) {
         return (com.google.protobuf.Timestamp) timestampBound_;
@@ -1966,7 +2023,7 @@ public com.google.protobuf.Timestamp getReadTimestamp() {
      *
      * .google.protobuf.Timestamp read_timestamp = 4;
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
       if (timestampBoundCase_ == 4) {
         return (com.google.protobuf.Timestamp) timestampBound_;
@@ -1994,7 +2051,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
      *
      * @return Whether the exactStaleness field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasExactStaleness() {
       return timestampBoundCase_ == 5;
     }
@@ -2017,7 +2074,7 @@ public boolean hasExactStaleness() {
      *
      * @return The exactStaleness.
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Duration getExactStaleness() {
       if (timestampBoundCase_ == 5) {
         return (com.google.protobuf.Duration) timestampBound_;
@@ -2041,7 +2098,7 @@ public com.google.protobuf.Duration getExactStaleness() {
      *
      * .google.protobuf.Duration exact_staleness = 5;
      */
-    @Override
+    @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getExactStalenessOrBuilder() {
       if (timestampBoundCase_ == 5) {
         return (com.google.protobuf.Duration) timestampBound_;
@@ -2063,14 +2120,14 @@ public com.google.protobuf.DurationOrBuilder getExactStalenessOrBuilder() {
      *
      * @return The returnReadTimestamp.
      */
-    @Override
+    @java.lang.Override
     public boolean getReturnReadTimestamp() {
       return returnReadTimestamp_;
     }
 
     private byte memoizedIsInitialized = -1;
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2080,10 +2137,10 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
       if (timestampBoundCase_ == 1) {
-        output.writeBool(1, (boolean) ((Boolean) timestampBound_));
+        output.writeBool(1, (boolean) ((java.lang.Boolean) timestampBound_));
       }
       if (timestampBoundCase_ == 2) {
         output.writeMessage(2, (com.google.protobuf.Timestamp) timestampBound_);
@@ -2103,7 +2160,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       unknownFields.writeTo(output);
     }
 
-    @Override
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2112,7 +2169,7 @@ public int getSerializedSize() {
       if (timestampBoundCase_ == 1) {
         size +=
             com.google.protobuf.CodedOutputStream.computeBoolSize(
-                1, (boolean) ((Boolean) timestampBound_));
+                1, (boolean) ((java.lang.Boolean) timestampBound_));
       }
       if (timestampBoundCase_ == 2) {
         size +=
@@ -2142,15 +2199,16 @@ public int getSerializedSize() {
       return size;
     }
 
-    @Override
-    public boolean equals(final Object obj) {
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof ReadOnly)) {
+      if (!(obj instanceof com.google.spanner.v1.TransactionOptions.ReadOnly)) {
         return super.equals(obj);
       }
-      ReadOnly other = (ReadOnly) obj;
+      com.google.spanner.v1.TransactionOptions.ReadOnly other =
+          (com.google.spanner.v1.TransactionOptions.ReadOnly) obj;
 
       if (getReturnReadTimestamp() != other.getReturnReadTimestamp()) return false;
       if (!getTimestampBoundCase().equals(other.getTimestampBoundCase())) return false;
@@ -2177,7 +2235,7 @@ public boolean equals(final Object obj) {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public int hashCode() {
       if (memoizedHashCode != 0) {
         return memoizedHashCode;
@@ -2215,69 +2273,71 @@ public int hashCode() {
       return hash;
     }
 
-    public static ReadOnly parseFrom(java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
+        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static ReadOnly parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
         java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static ReadOnly parseFrom(com.google.protobuf.ByteString data)
+    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
+        com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static ReadOnly parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static ReadOnly parseFrom(byte[] data)
+    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static ReadOnly parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
         byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static ReadOnly parseFrom(java.io.InputStream input) throws java.io.IOException {
+    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
+        java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static ReadOnly parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.ReadOnly 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 ReadOnly parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseDelimitedFrom(
+        java.io.InputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static ReadOnly parseDelimitedFrom(
+    public static com.google.spanner.v1.TransactionOptions.ReadOnly 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 ReadOnly parseFrom(com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
+    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
+        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
     }
 
-    public static ReadOnly parseFrom(
+    public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2285,7 +2345,7 @@ public static ReadOnly parseFrom(
           PARSER, input, extensionRegistry);
     }
 
-    @Override
+    @java.lang.Override
     public Builder newBuilderForType() {
       return newBuilder();
     }
@@ -2294,17 +2354,18 @@ public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
 
-    public static Builder newBuilder(ReadOnly prototype) {
+    public static Builder newBuilder(com.google.spanner.v1.TransactionOptions.ReadOnly prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
-    @Override
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
     }
 
-    @Override
-    protected Builder newBuilderForType(BuilderParent parent) {
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -2321,17 +2382,20 @@ public static final class Builder
         extends com.google.protobuf.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:google.spanner.v1.TransactionOptions.ReadOnly)
-        ReadOnlyOrBuilder {
+        com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return TransactionProto
+        return com.google.spanner.v1.TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_ReadOnly_descriptor;
       }
 
-      @Override
-      protected FieldAccessorTable internalGetFieldAccessorTable() {
-        return TransactionProto
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.spanner.v1.TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_ReadOnly_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(ReadOnly.class, Builder.class);
+            .ensureFieldAccessorsInitialized(
+                com.google.spanner.v1.TransactionOptions.ReadOnly.class,
+                com.google.spanner.v1.TransactionOptions.ReadOnly.Builder.class);
       }
 
       // Construct using com.google.spanner.v1.TransactionOptions.ReadOnly.newBuilder()
@@ -2339,7 +2403,7 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -2348,7 +2412,7 @@ private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
-      @Override
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         returnReadTimestamp_ = false;
@@ -2358,29 +2422,30 @@ public Builder clear() {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return TransactionProto
+        return com.google.spanner.v1.TransactionProto
             .internal_static_google_spanner_v1_TransactionOptions_ReadOnly_descriptor;
       }
 
-      @Override
-      public ReadOnly getDefaultInstanceForType() {
-        return ReadOnly.getDefaultInstance();
+      @java.lang.Override
+      public com.google.spanner.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() {
+        return com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
       }
 
-      @Override
-      public ReadOnly build() {
-        ReadOnly result = buildPartial();
+      @java.lang.Override
+      public com.google.spanner.v1.TransactionOptions.ReadOnly build() {
+        com.google.spanner.v1.TransactionOptions.ReadOnly result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      @Override
-      public ReadOnly buildPartial() {
-        ReadOnly result = new ReadOnly(this);
+      @java.lang.Override
+      public com.google.spanner.v1.TransactionOptions.ReadOnly buildPartial() {
+        com.google.spanner.v1.TransactionOptions.ReadOnly result =
+            new com.google.spanner.v1.TransactionOptions.ReadOnly(this);
         if (timestampBoundCase_ == 1) {
           result.timestampBound_ = timestampBound_;
         }
@@ -2418,50 +2483,54 @@ public ReadOnly buildPartial() {
         return result;
       }
 
-      @Override
+      @java.lang.Override
       public Builder clone() {
         return super.clone();
       }
 
-      @Override
-      public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.setField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
-      @Override
+      @java.lang.Override
       public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
-      @Override
+      @java.lang.Override
       public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof ReadOnly) {
-          return mergeFrom((ReadOnly) other);
+        if (other instanceof com.google.spanner.v1.TransactionOptions.ReadOnly) {
+          return mergeFrom((com.google.spanner.v1.TransactionOptions.ReadOnly) other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(ReadOnly other) {
-        if (other == ReadOnly.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.google.spanner.v1.TransactionOptions.ReadOnly other) {
+        if (other == com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance())
+          return this;
         if (other.getReturnReadTimestamp() != false) {
           setReturnReadTimestamp(other.getReturnReadTimestamp());
         }
@@ -2501,21 +2570,22 @@ public Builder mergeFrom(ReadOnly other) {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @Override
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        ReadOnly parsedMessage = null;
+        com.google.spanner.v1.TransactionOptions.ReadOnly parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (ReadOnly) e.getUnfinishedMessage();
+          parsedMessage =
+              (com.google.spanner.v1.TransactionOptions.ReadOnly) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2526,7 +2596,7 @@ public Builder mergeFrom(
       }
 
       private int timestampBoundCase_ = 0;
-      private Object timestampBound_;
+      private java.lang.Object timestampBound_;
 
       public TimestampBoundCase getTimestampBoundCase() {
         return TimestampBoundCase.forNumber(timestampBoundCase_);
@@ -2568,7 +2638,7 @@ public boolean hasStrong() {
        */
       public boolean getStrong() {
         if (timestampBoundCase_ == 1) {
-          return (Boolean) timestampBound_;
+          return (java.lang.Boolean) timestampBound_;
         }
         return false;
       }
@@ -2634,7 +2704,7 @@ public Builder clearStrong() {
        *
        * @return Whether the minReadTimestamp field is set.
        */
-      @Override
+      @java.lang.Override
       public boolean hasMinReadTimestamp() {
         return timestampBoundCase_ == 2;
       }
@@ -2655,7 +2725,7 @@ public boolean hasMinReadTimestamp() {
        *
        * @return The minReadTimestamp.
        */
-      @Override
+      @java.lang.Override
       public com.google.protobuf.Timestamp getMinReadTimestamp() {
         if (minReadTimestampBuilder_ == null) {
           if (timestampBoundCase_ == 2) {
@@ -2823,7 +2893,7 @@ public com.google.protobuf.Timestamp.Builder getMinReadTimestampBuilder() {
        *
        * .google.protobuf.Timestamp min_read_timestamp = 2;
        */
-      @Override
+      @java.lang.Override
       public com.google.protobuf.TimestampOrBuilder getMinReadTimestampOrBuilder() {
         if ((timestampBoundCase_ == 2) && (minReadTimestampBuilder_ != null)) {
           return minReadTimestampBuilder_.getMessageOrBuilder();
@@ -2900,7 +2970,7 @@ public com.google.protobuf.TimestampOrBuilder getMinReadTimestampOrBuilder() {
        *
        * @return Whether the maxStaleness field is set.
        */
-      @Override
+      @java.lang.Override
       public boolean hasMaxStaleness() {
         return timestampBoundCase_ == 3;
       }
@@ -2925,7 +2995,7 @@ public boolean hasMaxStaleness() {
        *
        * @return The maxStaleness.
        */
-      @Override
+      @java.lang.Override
       public com.google.protobuf.Duration getMaxStaleness() {
         if (maxStalenessBuilder_ == null) {
           if (timestampBoundCase_ == 3) {
@@ -3117,7 +3187,7 @@ public com.google.protobuf.Duration.Builder getMaxStalenessBuilder() {
        *
        * .google.protobuf.Duration max_staleness = 3;
        */
-      @Override
+      @java.lang.Override
       public com.google.protobuf.DurationOrBuilder getMaxStalenessOrBuilder() {
         if ((timestampBoundCase_ == 3) && (maxStalenessBuilder_ != null)) {
           return maxStalenessBuilder_.getMessageOrBuilder();
@@ -3197,7 +3267,7 @@ public com.google.protobuf.DurationOrBuilder getMaxStalenessOrBuilder() {
        *
        * @return Whether the readTimestamp field is set.
        */
-      @Override
+      @java.lang.Override
       public boolean hasReadTimestamp() {
         return timestampBoundCase_ == 4;
       }
@@ -3221,7 +3291,7 @@ public boolean hasReadTimestamp() {
        *
        * @return The readTimestamp.
        */
-      @Override
+      @java.lang.Override
       public com.google.protobuf.Timestamp getReadTimestamp() {
         if (readTimestampBuilder_ == null) {
           if (timestampBoundCase_ == 4) {
@@ -3407,7 +3477,7 @@ public com.google.protobuf.Timestamp.Builder getReadTimestampBuilder() {
        *
        * .google.protobuf.Timestamp read_timestamp = 4;
        */
-      @Override
+      @java.lang.Override
       public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
         if ((timestampBoundCase_ == 4) && (readTimestampBuilder_ != null)) {
           return readTimestampBuilder_.getMessageOrBuilder();
@@ -3485,7 +3555,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
        *
        * @return Whether the exactStaleness field is set.
        */
-      @Override
+      @java.lang.Override
       public boolean hasExactStaleness() {
         return timestampBoundCase_ == 5;
       }
@@ -3508,7 +3578,7 @@ public boolean hasExactStaleness() {
        *
        * @return The exactStaleness.
        */
-      @Override
+      @java.lang.Override
       public com.google.protobuf.Duration getExactStaleness() {
         if (exactStalenessBuilder_ == null) {
           if (timestampBoundCase_ == 5) {
@@ -3688,7 +3758,7 @@ public com.google.protobuf.Duration.Builder getExactStalenessBuilder() {
        *
        * .google.protobuf.Duration exact_staleness = 5;
        */
-      @Override
+      @java.lang.Override
       public com.google.protobuf.DurationOrBuilder getExactStalenessOrBuilder() {
         if ((timestampBoundCase_ == 5) && (exactStalenessBuilder_ != null)) {
           return exactStalenessBuilder_.getMessageOrBuilder();
@@ -3754,7 +3824,7 @@ public com.google.protobuf.DurationOrBuilder getExactStalenessOrBuilder() {
        *
        * @return The returnReadTimestamp.
        */
-      @Override
+      @java.lang.Override
       public boolean getReturnReadTimestamp() {
         return returnReadTimestamp_;
       }
@@ -3796,13 +3866,13 @@ public Builder clearReturnReadTimestamp() {
         return this;
       }
 
-      @Override
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
-      @Override
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -3812,19 +3882,19 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:google.spanner.v1.TransactionOptions.ReadOnly)
-    private static final ReadOnly DEFAULT_INSTANCE;
+    private static final com.google.spanner.v1.TransactionOptions.ReadOnly DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new ReadOnly();
+      DEFAULT_INSTANCE = new com.google.spanner.v1.TransactionOptions.ReadOnly();
     }
 
-    public static ReadOnly getDefaultInstance() {
+    public static com.google.spanner.v1.TransactionOptions.ReadOnly getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     private static final com.google.protobuf.Parser PARSER =
         new com.google.protobuf.AbstractParser() {
-          @Override
+          @java.lang.Override
           public ReadOnly parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3837,21 +3907,24 @@ public static com.google.protobuf.Parser parser() {
       return PARSER;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @Override
-    public ReadOnly getDefaultInstanceForType() {
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
 
   private int modeCase_ = 0;
-  private Object mode_;
+  private java.lang.Object mode_;
 
-  public enum ModeCase implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
+  public enum ModeCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     READ_WRITE(1),
     PARTITIONED_DML(3),
     READ_ONLY(2),
@@ -3866,7 +3939,7 @@ private ModeCase(int value) {
      * @return The enum associated with the given number.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @Deprecated
+    @java.lang.Deprecated
     public static ModeCase valueOf(int value) {
       return forNumber(value);
     }
@@ -3910,7 +3983,7 @@ public ModeCase getModeCase() {
    *
    * @return Whether the readWrite field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasReadWrite() {
     return modeCase_ == 1;
   }
@@ -3928,12 +4001,12 @@ public boolean hasReadWrite() {
    *
    * @return The readWrite.
    */
-  @Override
-  public ReadWrite getReadWrite() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionOptions.ReadWrite getReadWrite() {
     if (modeCase_ == 1) {
-      return (ReadWrite) mode_;
+      return (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_;
     }
-    return ReadWrite.getDefaultInstance();
+    return com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
   }
   /**
    *
@@ -3947,12 +4020,12 @@ public ReadWrite getReadWrite() {
    *
    * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
    */
-  @Override
-  public ReadWriteOrBuilder getReadWriteOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder() {
     if (modeCase_ == 1) {
-      return (ReadWrite) mode_;
+      return (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_;
     }
-    return ReadWrite.getDefaultInstance();
+    return com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
   }
 
   public static final int PARTITIONED_DML_FIELD_NUMBER = 3;
@@ -3970,7 +4043,7 @@ public ReadWriteOrBuilder getReadWriteOrBuilder() {
    *
    * @return Whether the partitionedDml field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasPartitionedDml() {
     return modeCase_ == 3;
   }
@@ -3988,12 +4061,12 @@ public boolean hasPartitionedDml() {
    *
    * @return The partitionedDml.
    */
-  @Override
-  public PartitionedDml getPartitionedDml() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionOptions.PartitionedDml getPartitionedDml() {
     if (modeCase_ == 3) {
-      return (PartitionedDml) mode_;
+      return (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_;
     }
-    return PartitionedDml.getDefaultInstance();
+    return com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
   }
   /**
    *
@@ -4007,12 +4080,13 @@ public PartitionedDml getPartitionedDml() {
    *
    * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
    */
-  @Override
-  public PartitionedDmlOrBuilder getPartitionedDmlOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder
+      getPartitionedDmlOrBuilder() {
     if (modeCase_ == 3) {
-      return (PartitionedDml) mode_;
+      return (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_;
     }
-    return PartitionedDml.getDefaultInstance();
+    return com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
   }
 
   public static final int READ_ONLY_FIELD_NUMBER = 2;
@@ -4030,7 +4104,7 @@ public PartitionedDmlOrBuilder getPartitionedDmlOrBuilder() {
    *
    * @return Whether the readOnly field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasReadOnly() {
     return modeCase_ == 2;
   }
@@ -4048,12 +4122,12 @@ public boolean hasReadOnly() {
    *
    * @return The readOnly.
    */
-  @Override
-  public ReadOnly getReadOnly() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionOptions.ReadOnly getReadOnly() {
     if (modeCase_ == 2) {
-      return (ReadOnly) mode_;
+      return (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_;
     }
-    return ReadOnly.getDefaultInstance();
+    return com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
   }
   /**
    *
@@ -4067,17 +4141,17 @@ public ReadOnly getReadOnly() {
    *
    * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
    */
-  @Override
-  public ReadOnlyOrBuilder getReadOnlyOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder() {
     if (modeCase_ == 2) {
-      return (ReadOnly) mode_;
+      return (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_;
     }
-    return ReadOnly.getDefaultInstance();
+    return com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -4087,49 +4161,55 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (modeCase_ == 1) {
-      output.writeMessage(1, (ReadWrite) mode_);
+      output.writeMessage(1, (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_);
     }
     if (modeCase_ == 2) {
-      output.writeMessage(2, (ReadOnly) mode_);
+      output.writeMessage(2, (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_);
     }
     if (modeCase_ == 3) {
-      output.writeMessage(3, (PartitionedDml) mode_);
+      output.writeMessage(3, (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_);
     }
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
     if (modeCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, (ReadWrite) mode_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              1, (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_);
     }
     if (modeCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, (ReadOnly) mode_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              2, (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_);
     }
     if (modeCase_ == 3) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, (PartitionedDml) mode_);
+      size +=
+          com.google.protobuf.CodedOutputStream.computeMessageSize(
+              3, (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof TransactionOptions)) {
+    if (!(obj instanceof com.google.spanner.v1.TransactionOptions)) {
       return super.equals(obj);
     }
-    TransactionOptions other = (TransactionOptions) obj;
+    com.google.spanner.v1.TransactionOptions other = (com.google.spanner.v1.TransactionOptions) obj;
 
     if (!getModeCase().equals(other.getModeCase())) return false;
     switch (modeCase_) {
@@ -4149,7 +4229,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -4177,69 +4257,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static TransactionOptions parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.TransactionOptions parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static TransactionOptions parseFrom(
+  public static com.google.spanner.v1.TransactionOptions parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static TransactionOptions parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.TransactionOptions parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static TransactionOptions parseFrom(
+  public static com.google.spanner.v1.TransactionOptions parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static TransactionOptions parseFrom(byte[] data)
+  public static com.google.spanner.v1.TransactionOptions parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static TransactionOptions parseFrom(
+  public static com.google.spanner.v1.TransactionOptions parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static TransactionOptions parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.TransactionOptions parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static TransactionOptions parseFrom(
+  public static com.google.spanner.v1.TransactionOptions 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 TransactionOptions parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.TransactionOptions parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static TransactionOptions parseDelimitedFrom(
+  public static com.google.spanner.v1.TransactionOptions 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 TransactionOptions parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.TransactionOptions parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static TransactionOptions parseFrom(
+  public static com.google.spanner.v1.TransactionOptions parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -4247,7 +4329,7 @@ public static TransactionOptions parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -4256,17 +4338,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(TransactionOptions prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.TransactionOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -4497,16 +4579,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.TransactionOptions)
-      TransactionOptionsOrBuilder {
+      com.google.spanner.v1.TransactionOptionsOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return TransactionProto.internal_static_google_spanner_v1_TransactionOptions_descriptor;
+      return com.google.spanner.v1.TransactionProto
+          .internal_static_google_spanner_v1_TransactionOptions_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return TransactionProto
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.TransactionProto
           .internal_static_google_spanner_v1_TransactionOptions_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(TransactionOptions.class, Builder.class);
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.TransactionOptions.class,
+              com.google.spanner.v1.TransactionOptions.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.TransactionOptions.newBuilder()
@@ -4514,7 +4600,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -4523,7 +4609,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       modeCase_ = 0;
@@ -4531,28 +4617,30 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return TransactionProto.internal_static_google_spanner_v1_TransactionOptions_descriptor;
+      return com.google.spanner.v1.TransactionProto
+          .internal_static_google_spanner_v1_TransactionOptions_descriptor;
     }
 
-    @Override
-    public TransactionOptions getDefaultInstanceForType() {
-      return TransactionOptions.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions getDefaultInstanceForType() {
+      return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
     }
 
-    @Override
-    public TransactionOptions build() {
-      TransactionOptions result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions build() {
+      com.google.spanner.v1.TransactionOptions result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public TransactionOptions buildPartial() {
-      TransactionOptions result = new TransactionOptions(this);
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions buildPartial() {
+      com.google.spanner.v1.TransactionOptions result =
+          new com.google.spanner.v1.TransactionOptions(this);
       if (modeCase_ == 1) {
         if (readWriteBuilder_ == null) {
           result.mode_ = mode_;
@@ -4579,50 +4667,51 @@ public TransactionOptions buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof TransactionOptions) {
-        return mergeFrom((TransactionOptions) other);
+      if (other instanceof com.google.spanner.v1.TransactionOptions) {
+        return mergeFrom((com.google.spanner.v1.TransactionOptions) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(TransactionOptions other) {
-      if (other == TransactionOptions.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.TransactionOptions other) {
+      if (other == com.google.spanner.v1.TransactionOptions.getDefaultInstance()) return this;
       switch (other.getModeCase()) {
         case READ_WRITE:
           {
@@ -4649,21 +4738,21 @@ public Builder mergeFrom(TransactionOptions other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      TransactionOptions parsedMessage = null;
+      com.google.spanner.v1.TransactionOptions parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (TransactionOptions) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.TransactionOptions) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -4674,7 +4763,7 @@ public Builder mergeFrom(
     }
 
     private int modeCase_ = 0;
-    private Object mode_;
+    private java.lang.Object mode_;
 
     public ModeCase getModeCase() {
       return ModeCase.forNumber(modeCase_);
@@ -4688,7 +4777,9 @@ public Builder clearMode() {
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            ReadWrite, ReadWrite.Builder, ReadWriteOrBuilder>
+            com.google.spanner.v1.TransactionOptions.ReadWrite,
+            com.google.spanner.v1.TransactionOptions.ReadWrite.Builder,
+            com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder>
         readWriteBuilder_;
     /**
      *
@@ -4704,7 +4795,7 @@ public Builder clearMode() {
      *
      * @return Whether the readWrite field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasReadWrite() {
       return modeCase_ == 1;
     }
@@ -4722,18 +4813,18 @@ public boolean hasReadWrite() {
      *
      * @return The readWrite.
      */
-    @Override
-    public ReadWrite getReadWrite() {
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions.ReadWrite getReadWrite() {
       if (readWriteBuilder_ == null) {
         if (modeCase_ == 1) {
-          return (ReadWrite) mode_;
+          return (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_;
         }
-        return ReadWrite.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
       } else {
         if (modeCase_ == 1) {
           return readWriteBuilder_.getMessage();
         }
-        return ReadWrite.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
       }
     }
     /**
@@ -4748,7 +4839,7 @@ public ReadWrite getReadWrite() {
      *
      * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
      */
-    public Builder setReadWrite(ReadWrite value) {
+    public Builder setReadWrite(com.google.spanner.v1.TransactionOptions.ReadWrite value) {
       if (readWriteBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -4773,7 +4864,8 @@ public Builder setReadWrite(ReadWrite value) {
      *
      * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
      */
-    public Builder setReadWrite(ReadWrite.Builder builderForValue) {
+    public Builder setReadWrite(
+        com.google.spanner.v1.TransactionOptions.ReadWrite.Builder builderForValue) {
       if (readWriteBuilder_ == null) {
         mode_ = builderForValue.build();
         onChanged();
@@ -4795,10 +4887,15 @@ public Builder setReadWrite(ReadWrite.Builder builderForValue) {
      *
      * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
      */
-    public Builder mergeReadWrite(ReadWrite value) {
+    public Builder mergeReadWrite(com.google.spanner.v1.TransactionOptions.ReadWrite value) {
       if (readWriteBuilder_ == null) {
-        if (modeCase_ == 1 && mode_ != ReadWrite.getDefaultInstance()) {
-          mode_ = ReadWrite.newBuilder((ReadWrite) mode_).mergeFrom(value).buildPartial();
+        if (modeCase_ == 1
+            && mode_ != com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance()) {
+          mode_ =
+              com.google.spanner.v1.TransactionOptions.ReadWrite.newBuilder(
+                      (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           mode_ = value;
         }
@@ -4852,7 +4949,7 @@ public Builder clearReadWrite() {
      *
      * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
      */
-    public ReadWrite.Builder getReadWriteBuilder() {
+    public com.google.spanner.v1.TransactionOptions.ReadWrite.Builder getReadWriteBuilder() {
       return getReadWriteFieldBuilder().getBuilder();
     }
     /**
@@ -4867,15 +4964,15 @@ public ReadWrite.Builder getReadWriteBuilder() {
      *
      * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
      */
-    @Override
-    public ReadWriteOrBuilder getReadWriteOrBuilder() {
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder() {
       if ((modeCase_ == 1) && (readWriteBuilder_ != null)) {
         return readWriteBuilder_.getMessageOrBuilder();
       } else {
         if (modeCase_ == 1) {
-          return (ReadWrite) mode_;
+          return (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_;
         }
-        return ReadWrite.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
       }
     }
     /**
@@ -4891,16 +4988,22 @@ public ReadWriteOrBuilder getReadWriteOrBuilder() {
      * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            ReadWrite, ReadWrite.Builder, ReadWriteOrBuilder>
+            com.google.spanner.v1.TransactionOptions.ReadWrite,
+            com.google.spanner.v1.TransactionOptions.ReadWrite.Builder,
+            com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder>
         getReadWriteFieldBuilder() {
       if (readWriteBuilder_ == null) {
         if (!(modeCase_ == 1)) {
-          mode_ = ReadWrite.getDefaultInstance();
+          mode_ = com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
         }
         readWriteBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                ReadWrite, ReadWrite.Builder, ReadWriteOrBuilder>(
-                (ReadWrite) mode_, getParentForChildren(), isClean());
+                com.google.spanner.v1.TransactionOptions.ReadWrite,
+                com.google.spanner.v1.TransactionOptions.ReadWrite.Builder,
+                com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder>(
+                (com.google.spanner.v1.TransactionOptions.ReadWrite) mode_,
+                getParentForChildren(),
+                isClean());
         mode_ = null;
       }
       modeCase_ = 1;
@@ -4910,7 +5013,9 @@ public ReadWriteOrBuilder getReadWriteOrBuilder() {
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            PartitionedDml, PartitionedDml.Builder, PartitionedDmlOrBuilder>
+            com.google.spanner.v1.TransactionOptions.PartitionedDml,
+            com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder,
+            com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder>
         partitionedDmlBuilder_;
     /**
      *
@@ -4926,7 +5031,7 @@ public ReadWriteOrBuilder getReadWriteOrBuilder() {
      *
      * @return Whether the partitionedDml field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasPartitionedDml() {
       return modeCase_ == 3;
     }
@@ -4944,18 +5049,18 @@ public boolean hasPartitionedDml() {
      *
      * @return The partitionedDml.
      */
-    @Override
-    public PartitionedDml getPartitionedDml() {
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions.PartitionedDml getPartitionedDml() {
       if (partitionedDmlBuilder_ == null) {
         if (modeCase_ == 3) {
-          return (PartitionedDml) mode_;
+          return (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_;
         }
-        return PartitionedDml.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
       } else {
         if (modeCase_ == 3) {
           return partitionedDmlBuilder_.getMessage();
         }
-        return PartitionedDml.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
       }
     }
     /**
@@ -4970,7 +5075,8 @@ public PartitionedDml getPartitionedDml() {
      *
      * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
      */
-    public Builder setPartitionedDml(PartitionedDml value) {
+    public Builder setPartitionedDml(
+        com.google.spanner.v1.TransactionOptions.PartitionedDml value) {
       if (partitionedDmlBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -4995,7 +5101,8 @@ public Builder setPartitionedDml(PartitionedDml value) {
      *
      * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
      */
-    public Builder setPartitionedDml(PartitionedDml.Builder builderForValue) {
+    public Builder setPartitionedDml(
+        com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder builderForValue) {
       if (partitionedDmlBuilder_ == null) {
         mode_ = builderForValue.build();
         onChanged();
@@ -5017,10 +5124,17 @@ public Builder setPartitionedDml(PartitionedDml.Builder builderForValue) {
      *
      * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
      */
-    public Builder mergePartitionedDml(PartitionedDml value) {
+    public Builder mergePartitionedDml(
+        com.google.spanner.v1.TransactionOptions.PartitionedDml value) {
       if (partitionedDmlBuilder_ == null) {
-        if (modeCase_ == 3 && mode_ != PartitionedDml.getDefaultInstance()) {
-          mode_ = PartitionedDml.newBuilder((PartitionedDml) mode_).mergeFrom(value).buildPartial();
+        if (modeCase_ == 3
+            && mode_
+                != com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance()) {
+          mode_ =
+              com.google.spanner.v1.TransactionOptions.PartitionedDml.newBuilder(
+                      (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           mode_ = value;
         }
@@ -5074,7 +5188,8 @@ public Builder clearPartitionedDml() {
      *
      * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
      */
-    public PartitionedDml.Builder getPartitionedDmlBuilder() {
+    public com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder
+        getPartitionedDmlBuilder() {
       return getPartitionedDmlFieldBuilder().getBuilder();
     }
     /**
@@ -5089,15 +5204,16 @@ public PartitionedDml.Builder getPartitionedDmlBuilder() {
      *
      * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
      */
-    @Override
-    public PartitionedDmlOrBuilder getPartitionedDmlOrBuilder() {
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder
+        getPartitionedDmlOrBuilder() {
       if ((modeCase_ == 3) && (partitionedDmlBuilder_ != null)) {
         return partitionedDmlBuilder_.getMessageOrBuilder();
       } else {
         if (modeCase_ == 3) {
-          return (PartitionedDml) mode_;
+          return (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_;
         }
-        return PartitionedDml.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
       }
     }
     /**
@@ -5113,16 +5229,22 @@ public PartitionedDmlOrBuilder getPartitionedDmlOrBuilder() {
      * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            PartitionedDml, PartitionedDml.Builder, PartitionedDmlOrBuilder>
+            com.google.spanner.v1.TransactionOptions.PartitionedDml,
+            com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder,
+            com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder>
         getPartitionedDmlFieldBuilder() {
       if (partitionedDmlBuilder_ == null) {
         if (!(modeCase_ == 3)) {
-          mode_ = PartitionedDml.getDefaultInstance();
+          mode_ = com.google.spanner.v1.TransactionOptions.PartitionedDml.getDefaultInstance();
         }
         partitionedDmlBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                PartitionedDml, PartitionedDml.Builder, PartitionedDmlOrBuilder>(
-                (PartitionedDml) mode_, getParentForChildren(), isClean());
+                com.google.spanner.v1.TransactionOptions.PartitionedDml,
+                com.google.spanner.v1.TransactionOptions.PartitionedDml.Builder,
+                com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder>(
+                (com.google.spanner.v1.TransactionOptions.PartitionedDml) mode_,
+                getParentForChildren(),
+                isClean());
         mode_ = null;
       }
       modeCase_ = 3;
@@ -5131,7 +5253,10 @@ public PartitionedDmlOrBuilder getPartitionedDmlOrBuilder() {
       return partitionedDmlBuilder_;
     }
 
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.TransactionOptions.ReadOnly,
+            com.google.spanner.v1.TransactionOptions.ReadOnly.Builder,
+            com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder>
         readOnlyBuilder_;
     /**
      *
@@ -5147,7 +5272,7 @@ public PartitionedDmlOrBuilder getPartitionedDmlOrBuilder() {
      *
      * @return Whether the readOnly field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasReadOnly() {
       return modeCase_ == 2;
     }
@@ -5165,18 +5290,18 @@ public boolean hasReadOnly() {
      *
      * @return The readOnly.
      */
-    @Override
-    public ReadOnly getReadOnly() {
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions.ReadOnly getReadOnly() {
       if (readOnlyBuilder_ == null) {
         if (modeCase_ == 2) {
-          return (ReadOnly) mode_;
+          return (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_;
         }
-        return ReadOnly.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
       } else {
         if (modeCase_ == 2) {
           return readOnlyBuilder_.getMessage();
         }
-        return ReadOnly.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
       }
     }
     /**
@@ -5191,7 +5316,7 @@ public ReadOnly getReadOnly() {
      *
      * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
      */
-    public Builder setReadOnly(ReadOnly value) {
+    public Builder setReadOnly(com.google.spanner.v1.TransactionOptions.ReadOnly value) {
       if (readOnlyBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -5216,7 +5341,8 @@ public Builder setReadOnly(ReadOnly value) {
      *
      * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
      */
-    public Builder setReadOnly(ReadOnly.Builder builderForValue) {
+    public Builder setReadOnly(
+        com.google.spanner.v1.TransactionOptions.ReadOnly.Builder builderForValue) {
       if (readOnlyBuilder_ == null) {
         mode_ = builderForValue.build();
         onChanged();
@@ -5238,10 +5364,15 @@ public Builder setReadOnly(ReadOnly.Builder builderForValue) {
      *
      * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
      */
-    public Builder mergeReadOnly(ReadOnly value) {
+    public Builder mergeReadOnly(com.google.spanner.v1.TransactionOptions.ReadOnly value) {
       if (readOnlyBuilder_ == null) {
-        if (modeCase_ == 2 && mode_ != ReadOnly.getDefaultInstance()) {
-          mode_ = ReadOnly.newBuilder((ReadOnly) mode_).mergeFrom(value).buildPartial();
+        if (modeCase_ == 2
+            && mode_ != com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance()) {
+          mode_ =
+              com.google.spanner.v1.TransactionOptions.ReadOnly.newBuilder(
+                      (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           mode_ = value;
         }
@@ -5295,7 +5426,7 @@ public Builder clearReadOnly() {
      *
      * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
      */
-    public ReadOnly.Builder getReadOnlyBuilder() {
+    public com.google.spanner.v1.TransactionOptions.ReadOnly.Builder getReadOnlyBuilder() {
       return getReadOnlyFieldBuilder().getBuilder();
     }
     /**
@@ -5310,15 +5441,15 @@ public ReadOnly.Builder getReadOnlyBuilder() {
      *
      * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
      */
-    @Override
-    public ReadOnlyOrBuilder getReadOnlyOrBuilder() {
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder() {
       if ((modeCase_ == 2) && (readOnlyBuilder_ != null)) {
         return readOnlyBuilder_.getMessageOrBuilder();
       } else {
         if (modeCase_ == 2) {
-          return (ReadOnly) mode_;
+          return (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_;
         }
-        return ReadOnly.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
       }
     }
     /**
@@ -5333,16 +5464,23 @@ public ReadOnlyOrBuilder getReadOnlyOrBuilder() {
      *
      * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
      */
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.TransactionOptions.ReadOnly,
+            com.google.spanner.v1.TransactionOptions.ReadOnly.Builder,
+            com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder>
         getReadOnlyFieldBuilder() {
       if (readOnlyBuilder_ == null) {
         if (!(modeCase_ == 2)) {
-          mode_ = ReadOnly.getDefaultInstance();
+          mode_ = com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
         }
         readOnlyBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                ReadOnly, ReadOnly.Builder, ReadOnlyOrBuilder>(
-                (ReadOnly) mode_, getParentForChildren(), isClean());
+                com.google.spanner.v1.TransactionOptions.ReadOnly,
+                com.google.spanner.v1.TransactionOptions.ReadOnly.Builder,
+                com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder>(
+                (com.google.spanner.v1.TransactionOptions.ReadOnly) mode_,
+                getParentForChildren(),
+                isClean());
         mode_ = null;
       }
       modeCase_ = 2;
@@ -5351,12 +5489,12 @@ public ReadOnlyOrBuilder getReadOnlyOrBuilder() {
       return readOnlyBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -5366,19 +5504,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.TransactionOptions)
-  private static final TransactionOptions DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.TransactionOptions DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new TransactionOptions();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.TransactionOptions();
   }
 
-  public static TransactionOptions getDefaultInstance() {
+  public static com.google.spanner.v1.TransactionOptions getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public TransactionOptions parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5391,13 +5529,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public TransactionOptions getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptionsOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptionsOrBuilder.java
index 238bfe22e6..c7b46083a1 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptionsOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptionsOrBuilder.java
@@ -52,7 +52,7 @@ public interface TransactionOptionsOrBuilder
    *
    * @return The readWrite.
    */
-  TransactionOptions.ReadWrite getReadWrite();
+  com.google.spanner.v1.TransactionOptions.ReadWrite getReadWrite();
   /**
    *
    *
@@ -65,7 +65,7 @@ public interface TransactionOptionsOrBuilder
    *
    * .google.spanner.v1.TransactionOptions.ReadWrite read_write = 1;
    */
-  TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder();
+  com.google.spanner.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder();
 
   /**
    *
@@ -96,7 +96,7 @@ public interface TransactionOptionsOrBuilder
    *
    * @return The partitionedDml.
    */
-  TransactionOptions.PartitionedDml getPartitionedDml();
+  com.google.spanner.v1.TransactionOptions.PartitionedDml getPartitionedDml();
   /**
    *
    *
@@ -109,7 +109,7 @@ public interface TransactionOptionsOrBuilder
    *
    * .google.spanner.v1.TransactionOptions.PartitionedDml partitioned_dml = 3;
    */
-  TransactionOptions.PartitionedDmlOrBuilder getPartitionedDmlOrBuilder();
+  com.google.spanner.v1.TransactionOptions.PartitionedDmlOrBuilder getPartitionedDmlOrBuilder();
 
   /**
    *
@@ -140,7 +140,7 @@ public interface TransactionOptionsOrBuilder
    *
    * @return The readOnly.
    */
-  TransactionOptions.ReadOnly getReadOnly();
+  com.google.spanner.v1.TransactionOptions.ReadOnly getReadOnly();
   /**
    *
    *
@@ -153,7 +153,7 @@ public interface TransactionOptionsOrBuilder
    *
    * .google.spanner.v1.TransactionOptions.ReadOnly read_only = 2;
    */
-  TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder();
+  com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder();
 
-  public TransactionOptions.ModeCase getModeCase();
+  public com.google.spanner.v1.TransactionOptions.ModeCase getModeCase();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java
index 430b0482ae..b3330eeacb 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java
@@ -59,7 +59,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
   static {
-    String[] descriptorData = {
+    java.lang.String[] descriptorData = {
       "\n#google/spanner/v1/transaction.proto\022\021g"
           + "oogle.spanner.v1\032\036google/protobuf/durati"
           + "on.proto\032\037google/protobuf/timestamp.prot"
@@ -104,7 +104,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_TransactionOptions_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_TransactionOptions_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "ReadWrite", "PartitionedDml", "ReadOnly", "Mode",
             });
     internal_static_google_spanner_v1_TransactionOptions_ReadWrite_descriptor =
@@ -112,19 +112,19 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_TransactionOptions_ReadWrite_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_TransactionOptions_ReadWrite_descriptor,
-            new String[] {});
+            new java.lang.String[] {});
     internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_descriptor =
         internal_static_google_spanner_v1_TransactionOptions_descriptor.getNestedTypes().get(1);
     internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_TransactionOptions_PartitionedDml_descriptor,
-            new String[] {});
+            new java.lang.String[] {});
     internal_static_google_spanner_v1_TransactionOptions_ReadOnly_descriptor =
         internal_static_google_spanner_v1_TransactionOptions_descriptor.getNestedTypes().get(2);
     internal_static_google_spanner_v1_TransactionOptions_ReadOnly_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_TransactionOptions_ReadOnly_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Strong",
               "MinReadTimestamp",
               "MaxStaleness",
@@ -138,7 +138,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_Transaction_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_Transaction_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Id", "ReadTimestamp",
             });
     internal_static_google_spanner_v1_TransactionSelector_descriptor =
@@ -146,7 +146,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_TransactionSelector_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_TransactionSelector_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "SingleUse", "Id", "Begin", "Selector",
             });
     com.google.protobuf.DurationProto.getDescriptor();
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java
index 7f884d5528..0ea44276aa 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java
@@ -42,13 +42,13 @@ private TransactionSelector(com.google.protobuf.GeneratedMessageV3.Builder bu
 
   private TransactionSelector() {}
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new TransactionSelector();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private TransactionSelector(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -73,13 +73,15 @@ private TransactionSelector(
             break;
           case 10:
             {
-              TransactionOptions.Builder subBuilder = null;
+              com.google.spanner.v1.TransactionOptions.Builder subBuilder = null;
               if (selectorCase_ == 1) {
-                subBuilder = ((TransactionOptions) selector_).toBuilder();
+                subBuilder = ((com.google.spanner.v1.TransactionOptions) selector_).toBuilder();
               }
-              selector_ = input.readMessage(TransactionOptions.parser(), extensionRegistry);
+              selector_ =
+                  input.readMessage(
+                      com.google.spanner.v1.TransactionOptions.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((TransactionOptions) selector_);
+                subBuilder.mergeFrom((com.google.spanner.v1.TransactionOptions) selector_);
                 selector_ = subBuilder.buildPartial();
               }
               selectorCase_ = 1;
@@ -93,13 +95,15 @@ private TransactionSelector(
             }
           case 26:
             {
-              TransactionOptions.Builder subBuilder = null;
+              com.google.spanner.v1.TransactionOptions.Builder subBuilder = null;
               if (selectorCase_ == 3) {
-                subBuilder = ((TransactionOptions) selector_).toBuilder();
+                subBuilder = ((com.google.spanner.v1.TransactionOptions) selector_).toBuilder();
               }
-              selector_ = input.readMessage(TransactionOptions.parser(), extensionRegistry);
+              selector_ =
+                  input.readMessage(
+                      com.google.spanner.v1.TransactionOptions.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((TransactionOptions) selector_);
+                subBuilder.mergeFrom((com.google.spanner.v1.TransactionOptions) selector_);
                 selector_ = subBuilder.buildPartial();
               }
               selectorCase_ = 3;
@@ -125,19 +129,27 @@ private TransactionSelector(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return TransactionProto.internal_static_google_spanner_v1_TransactionSelector_descriptor;
+    return com.google.spanner.v1.TransactionProto
+        .internal_static_google_spanner_v1_TransactionSelector_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return TransactionProto.internal_static_google_spanner_v1_TransactionSelector_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(TransactionSelector.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.TransactionProto
+        .internal_static_google_spanner_v1_TransactionSelector_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.TransactionSelector.class,
+            com.google.spanner.v1.TransactionSelector.Builder.class);
   }
 
   private int selectorCase_ = 0;
-  private Object selector_;
+  private java.lang.Object selector_;
 
-  public enum SelectorCase implements com.google.protobuf.Internal.EnumLite, InternalOneOfEnum {
+  public enum SelectorCase
+      implements
+          com.google.protobuf.Internal.EnumLite,
+          com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     SINGLE_USE(1),
     ID(2),
     BEGIN(3),
@@ -152,7 +164,7 @@ private SelectorCase(int value) {
      * @return The enum associated with the given number.
      * @deprecated Use {@link #forNumber(int)} instead.
      */
-    @Deprecated
+    @java.lang.Deprecated
     public static SelectorCase valueOf(int value) {
       return forNumber(value);
     }
@@ -195,7 +207,7 @@ public SelectorCase getSelectorCase() {
    *
    * @return Whether the singleUse field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasSingleUse() {
     return selectorCase_ == 1;
   }
@@ -212,12 +224,12 @@ public boolean hasSingleUse() {
    *
    * @return The singleUse.
    */
-  @Override
-  public TransactionOptions getSingleUse() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionOptions getSingleUse() {
     if (selectorCase_ == 1) {
-      return (TransactionOptions) selector_;
+      return (com.google.spanner.v1.TransactionOptions) selector_;
     }
-    return TransactionOptions.getDefaultInstance();
+    return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
   }
   /**
    *
@@ -230,12 +242,12 @@ public TransactionOptions getSingleUse() {
    *
    * .google.spanner.v1.TransactionOptions single_use = 1;
    */
-  @Override
-  public TransactionOptionsOrBuilder getSingleUseOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionOptionsOrBuilder getSingleUseOrBuilder() {
     if (selectorCase_ == 1) {
-      return (TransactionOptions) selector_;
+      return (com.google.spanner.v1.TransactionOptions) selector_;
     }
-    return TransactionOptions.getDefaultInstance();
+    return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
   }
 
   public static final int ID_FIELD_NUMBER = 2;
@@ -265,7 +277,7 @@ public boolean hasId() {
    *
    * @return The id.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString getId() {
     if (selectorCase_ == 2) {
       return (com.google.protobuf.ByteString) selector_;
@@ -287,7 +299,7 @@ public com.google.protobuf.ByteString getId() {
    *
    * @return Whether the begin field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasBegin() {
     return selectorCase_ == 3;
   }
@@ -304,12 +316,12 @@ public boolean hasBegin() {
    *
    * @return The begin.
    */
-  @Override
-  public TransactionOptions getBegin() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionOptions getBegin() {
     if (selectorCase_ == 3) {
-      return (TransactionOptions) selector_;
+      return (com.google.spanner.v1.TransactionOptions) selector_;
     }
-    return TransactionOptions.getDefaultInstance();
+    return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
   }
   /**
    *
@@ -322,17 +334,17 @@ public TransactionOptions getBegin() {
    *
    * .google.spanner.v1.TransactionOptions begin = 3;
    */
-  @Override
-  public TransactionOptionsOrBuilder getBeginOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionOptionsOrBuilder getBeginOrBuilder() {
     if (selectorCase_ == 3) {
-      return (TransactionOptions) selector_;
+      return (com.google.spanner.v1.TransactionOptions) selector_;
     }
-    return TransactionOptions.getDefaultInstance();
+    return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -342,21 +354,21 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
     if (selectorCase_ == 1) {
-      output.writeMessage(1, (TransactionOptions) selector_);
+      output.writeMessage(1, (com.google.spanner.v1.TransactionOptions) selector_);
     }
     if (selectorCase_ == 2) {
       output.writeBytes(2, (com.google.protobuf.ByteString) selector_);
     }
     if (selectorCase_ == 3) {
-      output.writeMessage(3, (TransactionOptions) selector_);
+      output.writeMessage(3, (com.google.spanner.v1.TransactionOptions) selector_);
     }
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -365,7 +377,7 @@ public int getSerializedSize() {
     if (selectorCase_ == 1) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(
-              1, (TransactionOptions) selector_);
+              1, (com.google.spanner.v1.TransactionOptions) selector_);
     }
     if (selectorCase_ == 2) {
       size +=
@@ -375,22 +387,23 @@ public int getSerializedSize() {
     if (selectorCase_ == 3) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(
-              3, (TransactionOptions) selector_);
+              3, (com.google.spanner.v1.TransactionOptions) selector_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof TransactionSelector)) {
+    if (!(obj instanceof com.google.spanner.v1.TransactionSelector)) {
       return super.equals(obj);
     }
-    TransactionSelector other = (TransactionSelector) obj;
+    com.google.spanner.v1.TransactionSelector other =
+        (com.google.spanner.v1.TransactionSelector) obj;
 
     if (!getSelectorCase().equals(other.getSelectorCase())) return false;
     switch (selectorCase_) {
@@ -410,7 +423,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -438,70 +451,71 @@ public int hashCode() {
     return hash;
   }
 
-  public static TransactionSelector parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.TransactionSelector parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static TransactionSelector parseFrom(
+  public static com.google.spanner.v1.TransactionSelector parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static TransactionSelector parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.TransactionSelector parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static TransactionSelector parseFrom(
+  public static com.google.spanner.v1.TransactionSelector parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static TransactionSelector parseFrom(byte[] data)
+  public static com.google.spanner.v1.TransactionSelector parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static TransactionSelector parseFrom(
+  public static com.google.spanner.v1.TransactionSelector parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static TransactionSelector parseFrom(java.io.InputStream input)
+  public static com.google.spanner.v1.TransactionSelector parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static TransactionSelector parseFrom(
+  public static com.google.spanner.v1.TransactionSelector 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 TransactionSelector parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.TransactionSelector parseDelimitedFrom(
+      java.io.InputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static TransactionSelector parseDelimitedFrom(
+  public static com.google.spanner.v1.TransactionSelector 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 TransactionSelector parseFrom(com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+  public static com.google.spanner.v1.TransactionSelector parseFrom(
+      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static TransactionSelector parseFrom(
+  public static com.google.spanner.v1.TransactionSelector parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -509,7 +523,7 @@ public static TransactionSelector parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -518,17 +532,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(TransactionSelector prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.TransactionSelector prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -547,16 +561,20 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.TransactionSelector)
-      TransactionSelectorOrBuilder {
+      com.google.spanner.v1.TransactionSelectorOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return TransactionProto.internal_static_google_spanner_v1_TransactionSelector_descriptor;
+      return com.google.spanner.v1.TransactionProto
+          .internal_static_google_spanner_v1_TransactionSelector_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return TransactionProto
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.TransactionProto
           .internal_static_google_spanner_v1_TransactionSelector_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(TransactionSelector.class, Builder.class);
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.TransactionSelector.class,
+              com.google.spanner.v1.TransactionSelector.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.TransactionSelector.newBuilder()
@@ -564,7 +582,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -573,7 +591,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       selectorCase_ = 0;
@@ -581,28 +599,30 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return TransactionProto.internal_static_google_spanner_v1_TransactionSelector_descriptor;
+      return com.google.spanner.v1.TransactionProto
+          .internal_static_google_spanner_v1_TransactionSelector_descriptor;
     }
 
-    @Override
-    public TransactionSelector getDefaultInstanceForType() {
-      return TransactionSelector.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionSelector getDefaultInstanceForType() {
+      return com.google.spanner.v1.TransactionSelector.getDefaultInstance();
     }
 
-    @Override
-    public TransactionSelector build() {
-      TransactionSelector result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionSelector build() {
+      com.google.spanner.v1.TransactionSelector result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public TransactionSelector buildPartial() {
-      TransactionSelector result = new TransactionSelector(this);
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionSelector buildPartial() {
+      com.google.spanner.v1.TransactionSelector result =
+          new com.google.spanner.v1.TransactionSelector(this);
       if (selectorCase_ == 1) {
         if (singleUseBuilder_ == null) {
           result.selector_ = selector_;
@@ -625,50 +645,51 @@ public TransactionSelector buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof TransactionSelector) {
-        return mergeFrom((TransactionSelector) other);
+      if (other instanceof com.google.spanner.v1.TransactionSelector) {
+        return mergeFrom((com.google.spanner.v1.TransactionSelector) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(TransactionSelector other) {
-      if (other == TransactionSelector.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.TransactionSelector other) {
+      if (other == com.google.spanner.v1.TransactionSelector.getDefaultInstance()) return this;
       switch (other.getSelectorCase()) {
         case SINGLE_USE:
           {
@@ -695,21 +716,21 @@ public Builder mergeFrom(TransactionSelector other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      TransactionSelector parsedMessage = null;
+      com.google.spanner.v1.TransactionSelector parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (TransactionSelector) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.TransactionSelector) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -720,7 +741,7 @@ public Builder mergeFrom(
     }
 
     private int selectorCase_ = 0;
-    private Object selector_;
+    private java.lang.Object selector_;
 
     public SelectorCase getSelectorCase() {
       return SelectorCase.forNumber(selectorCase_);
@@ -734,7 +755,9 @@ public Builder clearSelector() {
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            TransactionOptions, TransactionOptions.Builder, TransactionOptionsOrBuilder>
+            com.google.spanner.v1.TransactionOptions,
+            com.google.spanner.v1.TransactionOptions.Builder,
+            com.google.spanner.v1.TransactionOptionsOrBuilder>
         singleUseBuilder_;
     /**
      *
@@ -749,7 +772,7 @@ public Builder clearSelector() {
      *
      * @return Whether the singleUse field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasSingleUse() {
       return selectorCase_ == 1;
     }
@@ -766,18 +789,18 @@ public boolean hasSingleUse() {
      *
      * @return The singleUse.
      */
-    @Override
-    public TransactionOptions getSingleUse() {
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions getSingleUse() {
       if (singleUseBuilder_ == null) {
         if (selectorCase_ == 1) {
-          return (TransactionOptions) selector_;
+          return (com.google.spanner.v1.TransactionOptions) selector_;
         }
-        return TransactionOptions.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
       } else {
         if (selectorCase_ == 1) {
           return singleUseBuilder_.getMessage();
         }
-        return TransactionOptions.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
       }
     }
     /**
@@ -791,7 +814,7 @@ public TransactionOptions getSingleUse() {
      *
      * .google.spanner.v1.TransactionOptions single_use = 1;
      */
-    public Builder setSingleUse(TransactionOptions value) {
+    public Builder setSingleUse(com.google.spanner.v1.TransactionOptions value) {
       if (singleUseBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -815,7 +838,7 @@ public Builder setSingleUse(TransactionOptions value) {
      *
      * .google.spanner.v1.TransactionOptions single_use = 1;
      */
-    public Builder setSingleUse(TransactionOptions.Builder builderForValue) {
+    public Builder setSingleUse(com.google.spanner.v1.TransactionOptions.Builder builderForValue) {
       if (singleUseBuilder_ == null) {
         selector_ = builderForValue.build();
         onChanged();
@@ -836,11 +859,13 @@ public Builder setSingleUse(TransactionOptions.Builder builderForValue) {
      *
      * .google.spanner.v1.TransactionOptions single_use = 1;
      */
-    public Builder mergeSingleUse(TransactionOptions value) {
+    public Builder mergeSingleUse(com.google.spanner.v1.TransactionOptions value) {
       if (singleUseBuilder_ == null) {
-        if (selectorCase_ == 1 && selector_ != TransactionOptions.getDefaultInstance()) {
+        if (selectorCase_ == 1
+            && selector_ != com.google.spanner.v1.TransactionOptions.getDefaultInstance()) {
           selector_ =
-              TransactionOptions.newBuilder((TransactionOptions) selector_)
+              com.google.spanner.v1.TransactionOptions.newBuilder(
+                      (com.google.spanner.v1.TransactionOptions) selector_)
                   .mergeFrom(value)
                   .buildPartial();
         } else {
@@ -894,7 +919,7 @@ public Builder clearSingleUse() {
      *
      * .google.spanner.v1.TransactionOptions single_use = 1;
      */
-    public TransactionOptions.Builder getSingleUseBuilder() {
+    public com.google.spanner.v1.TransactionOptions.Builder getSingleUseBuilder() {
       return getSingleUseFieldBuilder().getBuilder();
     }
     /**
@@ -908,15 +933,15 @@ public TransactionOptions.Builder getSingleUseBuilder() {
      *
      * .google.spanner.v1.TransactionOptions single_use = 1;
      */
-    @Override
-    public TransactionOptionsOrBuilder getSingleUseOrBuilder() {
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptionsOrBuilder getSingleUseOrBuilder() {
       if ((selectorCase_ == 1) && (singleUseBuilder_ != null)) {
         return singleUseBuilder_.getMessageOrBuilder();
       } else {
         if (selectorCase_ == 1) {
-          return (TransactionOptions) selector_;
+          return (com.google.spanner.v1.TransactionOptions) selector_;
         }
-        return TransactionOptions.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
       }
     }
     /**
@@ -931,16 +956,22 @@ public TransactionOptionsOrBuilder getSingleUseOrBuilder() {
      * .google.spanner.v1.TransactionOptions single_use = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            TransactionOptions, TransactionOptions.Builder, TransactionOptionsOrBuilder>
+            com.google.spanner.v1.TransactionOptions,
+            com.google.spanner.v1.TransactionOptions.Builder,
+            com.google.spanner.v1.TransactionOptionsOrBuilder>
         getSingleUseFieldBuilder() {
       if (singleUseBuilder_ == null) {
         if (!(selectorCase_ == 1)) {
-          selector_ = TransactionOptions.getDefaultInstance();
+          selector_ = com.google.spanner.v1.TransactionOptions.getDefaultInstance();
         }
         singleUseBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                TransactionOptions, TransactionOptions.Builder, TransactionOptionsOrBuilder>(
-                (TransactionOptions) selector_, getParentForChildren(), isClean());
+                com.google.spanner.v1.TransactionOptions,
+                com.google.spanner.v1.TransactionOptions.Builder,
+                com.google.spanner.v1.TransactionOptionsOrBuilder>(
+                (com.google.spanner.v1.TransactionOptions) selector_,
+                getParentForChildren(),
+                isClean());
         selector_ = null;
       }
       selectorCase_ = 1;
@@ -1022,7 +1053,9 @@ public Builder clearId() {
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            TransactionOptions, TransactionOptions.Builder, TransactionOptionsOrBuilder>
+            com.google.spanner.v1.TransactionOptions,
+            com.google.spanner.v1.TransactionOptions.Builder,
+            com.google.spanner.v1.TransactionOptionsOrBuilder>
         beginBuilder_;
     /**
      *
@@ -1037,7 +1070,7 @@ public Builder clearId() {
      *
      * @return Whether the begin field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasBegin() {
       return selectorCase_ == 3;
     }
@@ -1054,18 +1087,18 @@ public boolean hasBegin() {
      *
      * @return The begin.
      */
-    @Override
-    public TransactionOptions getBegin() {
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptions getBegin() {
       if (beginBuilder_ == null) {
         if (selectorCase_ == 3) {
-          return (TransactionOptions) selector_;
+          return (com.google.spanner.v1.TransactionOptions) selector_;
         }
-        return TransactionOptions.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
       } else {
         if (selectorCase_ == 3) {
           return beginBuilder_.getMessage();
         }
-        return TransactionOptions.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
       }
     }
     /**
@@ -1079,7 +1112,7 @@ public TransactionOptions getBegin() {
      *
      * .google.spanner.v1.TransactionOptions begin = 3;
      */
-    public Builder setBegin(TransactionOptions value) {
+    public Builder setBegin(com.google.spanner.v1.TransactionOptions value) {
       if (beginBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1103,7 +1136,7 @@ public Builder setBegin(TransactionOptions value) {
      *
      * .google.spanner.v1.TransactionOptions begin = 3;
      */
-    public Builder setBegin(TransactionOptions.Builder builderForValue) {
+    public Builder setBegin(com.google.spanner.v1.TransactionOptions.Builder builderForValue) {
       if (beginBuilder_ == null) {
         selector_ = builderForValue.build();
         onChanged();
@@ -1124,11 +1157,13 @@ public Builder setBegin(TransactionOptions.Builder builderForValue) {
      *
      * .google.spanner.v1.TransactionOptions begin = 3;
      */
-    public Builder mergeBegin(TransactionOptions value) {
+    public Builder mergeBegin(com.google.spanner.v1.TransactionOptions value) {
       if (beginBuilder_ == null) {
-        if (selectorCase_ == 3 && selector_ != TransactionOptions.getDefaultInstance()) {
+        if (selectorCase_ == 3
+            && selector_ != com.google.spanner.v1.TransactionOptions.getDefaultInstance()) {
           selector_ =
-              TransactionOptions.newBuilder((TransactionOptions) selector_)
+              com.google.spanner.v1.TransactionOptions.newBuilder(
+                      (com.google.spanner.v1.TransactionOptions) selector_)
                   .mergeFrom(value)
                   .buildPartial();
         } else {
@@ -1182,7 +1217,7 @@ public Builder clearBegin() {
      *
      * .google.spanner.v1.TransactionOptions begin = 3;
      */
-    public TransactionOptions.Builder getBeginBuilder() {
+    public com.google.spanner.v1.TransactionOptions.Builder getBeginBuilder() {
       return getBeginFieldBuilder().getBuilder();
     }
     /**
@@ -1196,15 +1231,15 @@ public TransactionOptions.Builder getBeginBuilder() {
      *
      * .google.spanner.v1.TransactionOptions begin = 3;
      */
-    @Override
-    public TransactionOptionsOrBuilder getBeginOrBuilder() {
+    @java.lang.Override
+    public com.google.spanner.v1.TransactionOptionsOrBuilder getBeginOrBuilder() {
       if ((selectorCase_ == 3) && (beginBuilder_ != null)) {
         return beginBuilder_.getMessageOrBuilder();
       } else {
         if (selectorCase_ == 3) {
-          return (TransactionOptions) selector_;
+          return (com.google.spanner.v1.TransactionOptions) selector_;
         }
-        return TransactionOptions.getDefaultInstance();
+        return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
       }
     }
     /**
@@ -1219,16 +1254,22 @@ public TransactionOptionsOrBuilder getBeginOrBuilder() {
      * .google.spanner.v1.TransactionOptions begin = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            TransactionOptions, TransactionOptions.Builder, TransactionOptionsOrBuilder>
+            com.google.spanner.v1.TransactionOptions,
+            com.google.spanner.v1.TransactionOptions.Builder,
+            com.google.spanner.v1.TransactionOptionsOrBuilder>
         getBeginFieldBuilder() {
       if (beginBuilder_ == null) {
         if (!(selectorCase_ == 3)) {
-          selector_ = TransactionOptions.getDefaultInstance();
+          selector_ = com.google.spanner.v1.TransactionOptions.getDefaultInstance();
         }
         beginBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                TransactionOptions, TransactionOptions.Builder, TransactionOptionsOrBuilder>(
-                (TransactionOptions) selector_, getParentForChildren(), isClean());
+                com.google.spanner.v1.TransactionOptions,
+                com.google.spanner.v1.TransactionOptions.Builder,
+                com.google.spanner.v1.TransactionOptionsOrBuilder>(
+                (com.google.spanner.v1.TransactionOptions) selector_,
+                getParentForChildren(),
+                isClean());
         selector_ = null;
       }
       selectorCase_ = 3;
@@ -1237,12 +1278,12 @@ public TransactionOptionsOrBuilder getBeginOrBuilder() {
       return beginBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1252,19 +1293,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.TransactionSelector)
-  private static final TransactionSelector DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.TransactionSelector DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new TransactionSelector();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.TransactionSelector();
   }
 
-  public static TransactionSelector getDefaultInstance() {
+  public static com.google.spanner.v1.TransactionSelector getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public TransactionSelector parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1277,13 +1318,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public TransactionSelector getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.TransactionSelector getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelectorOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelectorOrBuilder.java
index d74585025c..8e33337d0c 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelectorOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelectorOrBuilder.java
@@ -50,7 +50,7 @@ public interface TransactionSelectorOrBuilder
    *
    * @return The singleUse.
    */
-  TransactionOptions getSingleUse();
+  com.google.spanner.v1.TransactionOptions getSingleUse();
   /**
    *
    *
@@ -62,7 +62,7 @@ public interface TransactionSelectorOrBuilder
    *
    * .google.spanner.v1.TransactionOptions single_use = 1;
    */
-  TransactionOptionsOrBuilder getSingleUseOrBuilder();
+  com.google.spanner.v1.TransactionOptionsOrBuilder getSingleUseOrBuilder();
 
   /**
    *
@@ -116,7 +116,7 @@ public interface TransactionSelectorOrBuilder
    *
    * @return The begin.
    */
-  TransactionOptions getBegin();
+  com.google.spanner.v1.TransactionOptions getBegin();
   /**
    *
    *
@@ -128,7 +128,7 @@ public interface TransactionSelectorOrBuilder
    *
    * .google.spanner.v1.TransactionOptions begin = 3;
    */
-  TransactionOptionsOrBuilder getBeginOrBuilder();
+  com.google.spanner.v1.TransactionOptionsOrBuilder getBeginOrBuilder();
 
-  public TransactionSelector.SelectorCase getSelectorCase();
+  public com.google.spanner.v1.TransactionSelector.SelectorCase getSelectorCase();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java
index cb123edd18..f02ccb4e13 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java
@@ -42,13 +42,13 @@ private Type() {
     code_ = 0;
   }
 
-  @Override
+  @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Type();
   }
 
-  @Override
+  @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
@@ -59,7 +59,7 @@ private Type(
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     if (extensionRegistry == null) {
-      throw new NullPointerException();
+      throw new java.lang.NullPointerException();
     }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -80,11 +80,12 @@ private Type(
             }
           case 18:
             {
-              Builder subBuilder = null;
+              com.google.spanner.v1.Type.Builder subBuilder = null;
               if (arrayElementType_ != null) {
                 subBuilder = arrayElementType_.toBuilder();
               }
-              arrayElementType_ = input.readMessage(Type.parser(), extensionRegistry);
+              arrayElementType_ =
+                  input.readMessage(com.google.spanner.v1.Type.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(arrayElementType_);
                 arrayElementType_ = subBuilder.buildPartial();
@@ -94,11 +95,12 @@ private Type(
             }
           case 26:
             {
-              StructType.Builder subBuilder = null;
+              com.google.spanner.v1.StructType.Builder subBuilder = null;
               if (structType_ != null) {
                 subBuilder = structType_.toBuilder();
               }
-              structType_ = input.readMessage(StructType.parser(), extensionRegistry);
+              structType_ =
+                  input.readMessage(com.google.spanner.v1.StructType.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(structType_);
                 structType_ = subBuilder.buildPartial();
@@ -126,13 +128,15 @@ private Type(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return TypeProto.internal_static_google_spanner_v1_Type_descriptor;
+    return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_Type_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable internalGetFieldAccessorTable() {
-    return TypeProto.internal_static_google_spanner_v1_Type_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(Type.class, Builder.class);
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_Type_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.spanner.v1.Type.class, com.google.spanner.v1.Type.Builder.class);
   }
 
   public static final int CODE_FIELD_NUMBER = 1;
@@ -148,7 +152,7 @@ protected FieldAccessorTable internalGetFieldAccessorTable() {
    *
    * @return The enum numeric value on the wire for code.
    */
-  @Override
+  @java.lang.Override
   public int getCodeValue() {
     return code_;
   }
@@ -163,15 +167,15 @@ public int getCodeValue() {
    *
    * @return The code.
    */
-  @Override
-  public TypeCode getCode() {
+  @java.lang.Override
+  public com.google.spanner.v1.TypeCode getCode() {
     @SuppressWarnings("deprecation")
-    TypeCode result = TypeCode.valueOf(code_);
-    return result == null ? TypeCode.UNRECOGNIZED : result;
+    com.google.spanner.v1.TypeCode result = com.google.spanner.v1.TypeCode.valueOf(code_);
+    return result == null ? com.google.spanner.v1.TypeCode.UNRECOGNIZED : result;
   }
 
   public static final int ARRAY_ELEMENT_TYPE_FIELD_NUMBER = 2;
-  private Type arrayElementType_;
+  private com.google.spanner.v1.Type arrayElementType_;
   /**
    *
    *
@@ -184,7 +188,7 @@ public TypeCode getCode() {
    *
    * @return Whether the arrayElementType field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasArrayElementType() {
     return arrayElementType_ != null;
   }
@@ -200,9 +204,11 @@ public boolean hasArrayElementType() {
    *
    * @return The arrayElementType.
    */
-  @Override
-  public Type getArrayElementType() {
-    return arrayElementType_ == null ? Type.getDefaultInstance() : arrayElementType_;
+  @java.lang.Override
+  public com.google.spanner.v1.Type getArrayElementType() {
+    return arrayElementType_ == null
+        ? com.google.spanner.v1.Type.getDefaultInstance()
+        : arrayElementType_;
   }
   /**
    *
@@ -214,13 +220,13 @@ public Type getArrayElementType() {
    *
    * .google.spanner.v1.Type array_element_type = 2;
    */
-  @Override
-  public TypeOrBuilder getArrayElementTypeOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.TypeOrBuilder getArrayElementTypeOrBuilder() {
     return getArrayElementType();
   }
 
   public static final int STRUCT_TYPE_FIELD_NUMBER = 3;
-  private StructType structType_;
+  private com.google.spanner.v1.StructType structType_;
   /**
    *
    *
@@ -233,7 +239,7 @@ public TypeOrBuilder getArrayElementTypeOrBuilder() {
    *
    * @return Whether the structType field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasStructType() {
     return structType_ != null;
   }
@@ -249,9 +255,11 @@ public boolean hasStructType() {
    *
    * @return The structType.
    */
-  @Override
-  public StructType getStructType() {
-    return structType_ == null ? StructType.getDefaultInstance() : structType_;
+  @java.lang.Override
+  public com.google.spanner.v1.StructType getStructType() {
+    return structType_ == null
+        ? com.google.spanner.v1.StructType.getDefaultInstance()
+        : structType_;
   }
   /**
    *
@@ -263,14 +271,14 @@ public StructType getStructType() {
    *
    * .google.spanner.v1.StructType struct_type = 3;
    */
-  @Override
-  public StructTypeOrBuilder getStructTypeOrBuilder() {
+  @java.lang.Override
+  public com.google.spanner.v1.StructTypeOrBuilder getStructTypeOrBuilder() {
     return getStructType();
   }
 
   private byte memoizedIsInitialized = -1;
 
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -280,9 +288,9 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (code_ != TypeCode.TYPE_CODE_UNSPECIFIED.getNumber()) {
+    if (code_ != com.google.spanner.v1.TypeCode.TYPE_CODE_UNSPECIFIED.getNumber()) {
       output.writeEnum(1, code_);
     }
     if (arrayElementType_ != null) {
@@ -294,13 +302,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     unknownFields.writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
-    if (code_ != TypeCode.TYPE_CODE_UNSPECIFIED.getNumber()) {
+    if (code_ != com.google.spanner.v1.TypeCode.TYPE_CODE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, code_);
     }
     if (arrayElementType_ != null) {
@@ -314,15 +322,15 @@ public int getSerializedSize() {
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
       return true;
     }
-    if (!(obj instanceof Type)) {
+    if (!(obj instanceof com.google.spanner.v1.Type)) {
       return super.equals(obj);
     }
-    Type other = (Type) obj;
+    com.google.spanner.v1.Type other = (com.google.spanner.v1.Type) obj;
 
     if (code_ != other.code_) return false;
     if (hasArrayElementType() != other.hasArrayElementType()) return false;
@@ -337,7 +345,7 @@ public boolean equals(final Object obj) {
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -359,68 +367,70 @@ public int hashCode() {
     return hash;
   }
 
-  public static Type parseFrom(java.nio.ByteBuffer data)
+  public static com.google.spanner.v1.Type parseFrom(java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Type parseFrom(
+  public static com.google.spanner.v1.Type parseFrom(
       java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Type parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.spanner.v1.Type parseFrom(com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Type parseFrom(
+  public static com.google.spanner.v1.Type parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Type parseFrom(byte[] data)
+  public static com.google.spanner.v1.Type parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
 
-  public static Type parseFrom(
+  public static com.google.spanner.v1.Type parseFrom(
       byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
 
-  public static Type parseFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.Type parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static Type parseFrom(
+  public static com.google.spanner.v1.Type 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 Type parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+  public static com.google.spanner.v1.Type parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static Type parseDelimitedFrom(
+  public static com.google.spanner.v1.Type 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 Type parseFrom(com.google.protobuf.CodedInputStream input)
+  public static com.google.spanner.v1.Type parseFrom(com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
   }
 
-  public static Type parseFrom(
+  public static com.google.spanner.v1.Type parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -428,7 +438,7 @@ public static Type parseFrom(
         PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() {
     return newBuilder();
   }
@@ -437,17 +447,17 @@ public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
 
-  public static Builder newBuilder(Type prototype) {
+  public static Builder newBuilder(com.google.spanner.v1.Type prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
 
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
-  protected Builder newBuilderForType(BuilderParent parent) {
+  @java.lang.Override
+  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -464,15 +474,18 @@ protected Builder newBuilderForType(BuilderParent parent) {
   public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
       implements
       // @@protoc_insertion_point(builder_implements:google.spanner.v1.Type)
-      TypeOrBuilder {
+      com.google.spanner.v1.TypeOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return TypeProto.internal_static_google_spanner_v1_Type_descriptor;
+      return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_Type_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable internalGetFieldAccessorTable() {
-      return TypeProto.internal_static_google_spanner_v1_Type_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(Type.class, Builder.class);
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.spanner.v1.TypeProto
+          .internal_static_google_spanner_v1_Type_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.spanner.v1.Type.class, com.google.spanner.v1.Type.Builder.class);
     }
 
     // Construct using com.google.spanner.v1.Type.newBuilder()
@@ -480,7 +493,7 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(BuilderParent parent) {
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -489,7 +502,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       code_ = 0;
@@ -509,28 +522,28 @@ public Builder clear() {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return TypeProto.internal_static_google_spanner_v1_Type_descriptor;
+      return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_Type_descriptor;
     }
 
-    @Override
-    public Type getDefaultInstanceForType() {
-      return Type.getDefaultInstance();
+    @java.lang.Override
+    public com.google.spanner.v1.Type getDefaultInstanceForType() {
+      return com.google.spanner.v1.Type.getDefaultInstance();
     }
 
-    @Override
-    public Type build() {
-      Type result = buildPartial();
+    @java.lang.Override
+    public com.google.spanner.v1.Type build() {
+      com.google.spanner.v1.Type result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public Type buildPartial() {
-      Type result = new Type(this);
+    @java.lang.Override
+    public com.google.spanner.v1.Type buildPartial() {
+      com.google.spanner.v1.Type result = new com.google.spanner.v1.Type(this);
       result.code_ = code_;
       if (arrayElementTypeBuilder_ == null) {
         result.arrayElementType_ = arrayElementType_;
@@ -546,50 +559,51 @@ public Type buildPartial() {
       return result;
     }
 
-    @Override
+    @java.lang.Override
     public Builder clone() {
       return super.clone();
     }
 
-    @Override
-    public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.setField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
 
-    @Override
+    @java.lang.Override
     public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
 
-    @Override
+    @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof Type) {
-        return mergeFrom((Type) other);
+      if (other instanceof com.google.spanner.v1.Type) {
+        return mergeFrom((com.google.spanner.v1.Type) other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(Type other) {
-      if (other == Type.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.google.spanner.v1.Type other) {
+      if (other == com.google.spanner.v1.Type.getDefaultInstance()) return this;
       if (other.code_ != 0) {
         setCodeValue(other.getCodeValue());
       }
@@ -604,21 +618,21 @@ public Builder mergeFrom(Type other) {
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Type parsedMessage = null;
+      com.google.spanner.v1.Type parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (Type) e.getUnfinishedMessage();
+        parsedMessage = (com.google.spanner.v1.Type) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -640,7 +654,7 @@ public Builder mergeFrom(
      *
      * @return The enum numeric value on the wire for code.
      */
-    @Override
+    @java.lang.Override
     public int getCodeValue() {
       return code_;
     }
@@ -673,11 +687,11 @@ public Builder setCodeValue(int value) {
      *
      * @return The code.
      */
-    @Override
-    public TypeCode getCode() {
+    @java.lang.Override
+    public com.google.spanner.v1.TypeCode getCode() {
       @SuppressWarnings("deprecation")
-      TypeCode result = TypeCode.valueOf(code_);
-      return result == null ? TypeCode.UNRECOGNIZED : result;
+      com.google.spanner.v1.TypeCode result = com.google.spanner.v1.TypeCode.valueOf(code_);
+      return result == null ? com.google.spanner.v1.TypeCode.UNRECOGNIZED : result;
     }
     /**
      *
@@ -691,7 +705,7 @@ public TypeCode getCode() {
      * @param value The code to set.
      * @return This builder for chaining.
      */
-    public Builder setCode(TypeCode value) {
+    public Builder setCode(com.google.spanner.v1.TypeCode value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -718,8 +732,11 @@ public Builder clearCode() {
       return this;
     }
 
-    private Type arrayElementType_;
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.spanner.v1.Type arrayElementType_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Type,
+            com.google.spanner.v1.Type.Builder,
+            com.google.spanner.v1.TypeOrBuilder>
         arrayElementTypeBuilder_;
     /**
      *
@@ -748,9 +765,11 @@ public boolean hasArrayElementType() {
      *
      * @return The arrayElementType.
      */
-    public Type getArrayElementType() {
+    public com.google.spanner.v1.Type getArrayElementType() {
       if (arrayElementTypeBuilder_ == null) {
-        return arrayElementType_ == null ? Type.getDefaultInstance() : arrayElementType_;
+        return arrayElementType_ == null
+            ? com.google.spanner.v1.Type.getDefaultInstance()
+            : arrayElementType_;
       } else {
         return arrayElementTypeBuilder_.getMessage();
       }
@@ -765,7 +784,7 @@ public Type getArrayElementType() {
      *
      * .google.spanner.v1.Type array_element_type = 2;
      */
-    public Builder setArrayElementType(Type value) {
+    public Builder setArrayElementType(com.google.spanner.v1.Type value) {
       if (arrayElementTypeBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -788,7 +807,7 @@ public Builder setArrayElementType(Type value) {
      *
      * .google.spanner.v1.Type array_element_type = 2;
      */
-    public Builder setArrayElementType(Builder builderForValue) {
+    public Builder setArrayElementType(com.google.spanner.v1.Type.Builder builderForValue) {
       if (arrayElementTypeBuilder_ == null) {
         arrayElementType_ = builderForValue.build();
         onChanged();
@@ -808,10 +827,13 @@ public Builder setArrayElementType(Builder builderForValue) {
      *
      * .google.spanner.v1.Type array_element_type = 2;
      */
-    public Builder mergeArrayElementType(Type value) {
+    public Builder mergeArrayElementType(com.google.spanner.v1.Type value) {
       if (arrayElementTypeBuilder_ == null) {
         if (arrayElementType_ != null) {
-          arrayElementType_ = Type.newBuilder(arrayElementType_).mergeFrom(value).buildPartial();
+          arrayElementType_ =
+              com.google.spanner.v1.Type.newBuilder(arrayElementType_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           arrayElementType_ = value;
         }
@@ -853,7 +875,7 @@ public Builder clearArrayElementType() {
      *
      * .google.spanner.v1.Type array_element_type = 2;
      */
-    public Builder getArrayElementTypeBuilder() {
+    public com.google.spanner.v1.Type.Builder getArrayElementTypeBuilder() {
 
       onChanged();
       return getArrayElementTypeFieldBuilder().getBuilder();
@@ -868,11 +890,13 @@ public Builder getArrayElementTypeBuilder() {
      *
      * .google.spanner.v1.Type array_element_type = 2;
      */
-    public TypeOrBuilder getArrayElementTypeOrBuilder() {
+    public com.google.spanner.v1.TypeOrBuilder getArrayElementTypeOrBuilder() {
       if (arrayElementTypeBuilder_ != null) {
         return arrayElementTypeBuilder_.getMessageOrBuilder();
       } else {
-        return arrayElementType_ == null ? Type.getDefaultInstance() : arrayElementType_;
+        return arrayElementType_ == null
+            ? com.google.spanner.v1.Type.getDefaultInstance()
+            : arrayElementType_;
       }
     }
     /**
@@ -885,20 +909,28 @@ public TypeOrBuilder getArrayElementTypeOrBuilder() {
      *
      * .google.spanner.v1.Type array_element_type = 2;
      */
-    private com.google.protobuf.SingleFieldBuilderV3
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.spanner.v1.Type,
+            com.google.spanner.v1.Type.Builder,
+            com.google.spanner.v1.TypeOrBuilder>
         getArrayElementTypeFieldBuilder() {
       if (arrayElementTypeBuilder_ == null) {
         arrayElementTypeBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3(
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.spanner.v1.Type,
+                com.google.spanner.v1.Type.Builder,
+                com.google.spanner.v1.TypeOrBuilder>(
                 getArrayElementType(), getParentForChildren(), isClean());
         arrayElementType_ = null;
       }
       return arrayElementTypeBuilder_;
     }
 
-    private StructType structType_;
+    private com.google.spanner.v1.StructType structType_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            StructType, StructType.Builder, StructTypeOrBuilder>
+            com.google.spanner.v1.StructType,
+            com.google.spanner.v1.StructType.Builder,
+            com.google.spanner.v1.StructTypeOrBuilder>
         structTypeBuilder_;
     /**
      *
@@ -927,9 +959,11 @@ public boolean hasStructType() {
      *
      * @return The structType.
      */
-    public StructType getStructType() {
+    public com.google.spanner.v1.StructType getStructType() {
       if (structTypeBuilder_ == null) {
-        return structType_ == null ? StructType.getDefaultInstance() : structType_;
+        return structType_ == null
+            ? com.google.spanner.v1.StructType.getDefaultInstance()
+            : structType_;
       } else {
         return structTypeBuilder_.getMessage();
       }
@@ -944,7 +978,7 @@ public StructType getStructType() {
      *
      * .google.spanner.v1.StructType struct_type = 3;
      */
-    public Builder setStructType(StructType value) {
+    public Builder setStructType(com.google.spanner.v1.StructType value) {
       if (structTypeBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -967,7 +1001,7 @@ public Builder setStructType(StructType value) {
      *
      * .google.spanner.v1.StructType struct_type = 3;
      */
-    public Builder setStructType(StructType.Builder builderForValue) {
+    public Builder setStructType(com.google.spanner.v1.StructType.Builder builderForValue) {
       if (structTypeBuilder_ == null) {
         structType_ = builderForValue.build();
         onChanged();
@@ -987,10 +1021,13 @@ public Builder setStructType(StructType.Builder builderForValue) {
      *
      * .google.spanner.v1.StructType struct_type = 3;
      */
-    public Builder mergeStructType(StructType value) {
+    public Builder mergeStructType(com.google.spanner.v1.StructType value) {
       if (structTypeBuilder_ == null) {
         if (structType_ != null) {
-          structType_ = StructType.newBuilder(structType_).mergeFrom(value).buildPartial();
+          structType_ =
+              com.google.spanner.v1.StructType.newBuilder(structType_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           structType_ = value;
         }
@@ -1032,7 +1069,7 @@ public Builder clearStructType() {
      *
      * .google.spanner.v1.StructType struct_type = 3;
      */
-    public StructType.Builder getStructTypeBuilder() {
+    public com.google.spanner.v1.StructType.Builder getStructTypeBuilder() {
 
       onChanged();
       return getStructTypeFieldBuilder().getBuilder();
@@ -1047,11 +1084,13 @@ public StructType.Builder getStructTypeBuilder() {
      *
      * .google.spanner.v1.StructType struct_type = 3;
      */
-    public StructTypeOrBuilder getStructTypeOrBuilder() {
+    public com.google.spanner.v1.StructTypeOrBuilder getStructTypeOrBuilder() {
       if (structTypeBuilder_ != null) {
         return structTypeBuilder_.getMessageOrBuilder();
       } else {
-        return structType_ == null ? StructType.getDefaultInstance() : structType_;
+        return structType_ == null
+            ? com.google.spanner.v1.StructType.getDefaultInstance()
+            : structType_;
       }
     }
     /**
@@ -1065,24 +1104,28 @@ public StructTypeOrBuilder getStructTypeOrBuilder() {
      * .google.spanner.v1.StructType struct_type = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            StructType, StructType.Builder, StructTypeOrBuilder>
+            com.google.spanner.v1.StructType,
+            com.google.spanner.v1.StructType.Builder,
+            com.google.spanner.v1.StructTypeOrBuilder>
         getStructTypeFieldBuilder() {
       if (structTypeBuilder_ == null) {
         structTypeBuilder_ =
             new com.google.protobuf.SingleFieldBuilderV3<
-                StructType, StructType.Builder, StructTypeOrBuilder>(
+                com.google.spanner.v1.StructType,
+                com.google.spanner.v1.StructType.Builder,
+                com.google.spanner.v1.StructTypeOrBuilder>(
                 getStructType(), getParentForChildren(), isClean());
         structType_ = null;
       }
       return structTypeBuilder_;
     }
 
-    @Override
+    @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
-    @Override
+    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1092,19 +1135,19 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:google.spanner.v1.Type)
-  private static final Type DEFAULT_INSTANCE;
+  private static final com.google.spanner.v1.Type DEFAULT_INSTANCE;
 
   static {
-    DEFAULT_INSTANCE = new Type();
+    DEFAULT_INSTANCE = new com.google.spanner.v1.Type();
   }
 
-  public static Type getDefaultInstance() {
+  public static com.google.spanner.v1.Type getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser PARSER =
       new com.google.protobuf.AbstractParser() {
-        @Override
+        @java.lang.Override
         public Type parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1117,13 +1160,13 @@ public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public Type getDefaultInstanceForType() {
+  @java.lang.Override
+  public com.google.spanner.v1.Type getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeCode.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeCode.java
index 4bbe65e875..77d751575c 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeCode.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeCode.java
@@ -295,7 +295,8 @@ public enum TypeCode implements com.google.protobuf.ProtocolMessageEnum {
 
   public final int getNumber() {
     if (this == UNRECOGNIZED) {
-      throw new IllegalArgumentException("Can't get the number of an unknown enum value.");
+      throw new java.lang.IllegalArgumentException(
+          "Can't get the number of an unknown enum value.");
     }
     return value;
   }
@@ -305,7 +306,7 @@ public final int getNumber() {
    * @return The enum associated with the given numeric wire value.
    * @deprecated Use {@link #forNumber(int)} instead.
    */
-  @Deprecated
+  @java.lang.Deprecated
   public static TypeCode valueOf(int value) {
     return forNumber(value);
   }
@@ -356,7 +357,8 @@ public TypeCode findValueByNumber(int number) {
 
   public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
     if (this == UNRECOGNIZED) {
-      throw new IllegalStateException("Can't get the descriptor of an unrecognized enum value.");
+      throw new java.lang.IllegalStateException(
+          "Can't get the descriptor of an unrecognized enum value.");
     }
     return getDescriptor().getValues().get(ordinal());
   }
@@ -366,14 +368,14 @@ public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType
   }
 
   public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-    return TypeProto.getDescriptor().getEnumTypes().get(0);
+    return com.google.spanner.v1.TypeProto.getDescriptor().getEnumTypes().get(0);
   }
 
   private static final TypeCode[] VALUES = values();
 
   public static TypeCode valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
     if (desc.getType() != getDescriptor()) {
-      throw new IllegalArgumentException("EnumValueDescriptor is not for this type.");
+      throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
     }
     if (desc.getIndex() == -1) {
       return UNRECOGNIZED;
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeOrBuilder.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeOrBuilder.java
index de0fa37d79..bd37d1e7d2 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeOrBuilder.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeOrBuilder.java
@@ -46,7 +46,7 @@ public interface TypeOrBuilder
    *
    * @return The code.
    */
-  TypeCode getCode();
+  com.google.spanner.v1.TypeCode getCode();
 
   /**
    *
@@ -73,7 +73,7 @@ public interface TypeOrBuilder
    *
    * @return The arrayElementType.
    */
-  Type getArrayElementType();
+  com.google.spanner.v1.Type getArrayElementType();
   /**
    *
    *
@@ -84,7 +84,7 @@ public interface TypeOrBuilder
    *
    * .google.spanner.v1.Type array_element_type = 2;
    */
-  TypeOrBuilder getArrayElementTypeOrBuilder();
+  com.google.spanner.v1.TypeOrBuilder getArrayElementTypeOrBuilder();
 
   /**
    *
@@ -111,7 +111,7 @@ public interface TypeOrBuilder
    *
    * @return The structType.
    */
-  StructType getStructType();
+  com.google.spanner.v1.StructType getStructType();
   /**
    *
    *
@@ -122,5 +122,5 @@ public interface TypeOrBuilder
    *
    * .google.spanner.v1.StructType struct_type = 3;
    */
-  StructTypeOrBuilder getStructTypeOrBuilder();
+  com.google.spanner.v1.StructTypeOrBuilder getStructTypeOrBuilder();
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
index ad6000d087..042f242919 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
@@ -47,7 +47,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
   static {
-    String[] descriptorData = {
+    java.lang.String[] descriptorData = {
       "\n\034google/spanner/v1/type.proto\022\021google.s"
           + "panner.v1\032\037google/api/field_behavior.pro"
           + "to\032\034google/api/annotations.proto\"\237\001\n\004Typ"
@@ -79,7 +79,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_Type_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_Type_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Code", "ArrayElementType", "StructType",
             });
     internal_static_google_spanner_v1_StructType_descriptor =
@@ -87,7 +87,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_StructType_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_StructType_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Fields",
             });
     internal_static_google_spanner_v1_StructType_Field_descriptor =
@@ -95,7 +95,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     internal_static_google_spanner_v1_StructType_Field_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_spanner_v1_StructType_Field_descriptor,
-            new String[] {
+            new java.lang.String[] {
               "Name", "Type",
             });
     com.google.protobuf.ExtensionRegistry registry =

From 2d7f161caf5bca586ff6882b5ed6404e53adcee5 Mon Sep 17 00:00:00 2001
From: Mayur Kale 
Date: Wed, 31 Mar 2021 12:37:25 -0700
Subject: [PATCH 09/12] chore: fix lint

---
 .../main/java/com/google/cloud/spanner/CommitResponse.java    | 4 ----
 .../src/main/java/com/google/cloud/spanner/SessionImpl.java   | 1 +
 .../java/com/google/cloud/spanner/TransactionRunnerImpl.java  | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/CommitResponse.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/CommitResponse.java
index 927cc36d6c..3ebd8f5531 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/CommitResponse.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/CommitResponse.java
@@ -25,10 +25,6 @@ public class CommitResponse {
 
   private final com.google.spanner.v1.CommitResponse proto;
 
-  static CommitResponse fromProto(com.google.spanner.v1.CommitResponse proto) {
-    return new CommitResponse(Timestamp.fromProto(proto.getCommitTimestamp()));
-  }
-
   public CommitResponse(Timestamp commitTimestamp) {
     this.proto =
         com.google.spanner.v1.CommitResponse.newBuilder()
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
index ef219d5510..52e2c2389c 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
@@ -176,6 +176,7 @@ public CommitResponse writeAtLeastOnceWithOptions(
     if (commitRequestOptions.hasPriority()) {
       requestBuilder.setRequestOptions(
           RequestOptions.newBuilder().setPriority(commitRequestOptions.priority()).build());
+    }
     Options opts = Options.fromTransactionOptions(transactionOptions);
     if (opts.hasTag()) {
       requestBuilder.setRequestOptions(
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
index cbf84991eb..df1a148d41 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
@@ -352,6 +352,7 @@ public void run() {
           if (options.hasPriority()) {
             requestBuilder.setRequestOptions(
                 RequestOptions.newBuilder().setPriority(options.priority()).build());
+          }
           if (options.hasTag()) {
             requestBuilder.setRequestOptions(
                 RequestOptions.newBuilder().setTransactionTag(options.tag()).build());

From e618d6d50d1c665fa347939b4623e754a5af38af Mon Sep 17 00:00:00 2001
From: Mayur Kale 
Date: Wed, 31 Mar 2021 14:48:26 -0700
Subject: [PATCH 10/12] chore: add more tests

---
 .../spanner/PartitionedDmlTransaction.java    |  15 +-
 .../com/google/cloud/spanner/SessionImpl.java |  17 +-
 .../cloud/spanner/TransactionRunnerImpl.java  |  28 +-
 .../spanner/AbstractReadContextTest.java      |  14 +-
 .../cloud/spanner/DatabaseClientImplTest.java | 274 +++++++++++++++++-
 .../com/google/cloud/spanner/OptionsTest.java |  21 +-
 .../PartitionedDmlTransactionTest.java        |  12 +-
 .../google/cloud/spanner/SessionImplTest.java |   2 +-
 8 files changed, 339 insertions(+), 44 deletions(-)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDmlTransaction.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDmlTransaction.java
index 95ad15aa6c..2aeceb276d 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDmlTransaction.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDmlTransaction.java
@@ -181,12 +181,15 @@ ExecuteSqlRequest newTransactionRequestFrom(final Statement statement, final Opt
 
     builder.setResumeToken(ByteString.EMPTY);
 
-    if (options.hasPriority()) {
-      builder.setRequestOptions(
-          RequestOptions.newBuilder().setPriority(options.priority()).build());
-    }
-    if (options.hasTag()) {
-      builder.setRequestOptions(RequestOptions.newBuilder().setRequestTag(options.tag()).build());
+    if (options.hasPriority() || options.hasTag()) {
+      RequestOptions.Builder requestOptionsBuilder = RequestOptions.newBuilder();
+      if (options.hasPriority()) {
+        requestOptionsBuilder.setPriority(options.priority());
+      }
+      if (options.hasTag()) {
+        requestOptionsBuilder.setRequestTag(options.tag());
+      }
+      builder.setRequestOptions(requestOptionsBuilder.build());
     }
     return builder.build();
   }
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
index 52e2c2389c..874c11a5d8 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
@@ -173,14 +173,15 @@ public CommitResponse writeAtLeastOnceWithOptions(
             .setSingleUseTransaction(
                 TransactionOptions.newBuilder()
                     .setReadWrite(TransactionOptions.ReadWrite.getDefaultInstance()));
-    if (commitRequestOptions.hasPriority()) {
-      requestBuilder.setRequestOptions(
-          RequestOptions.newBuilder().setPriority(commitRequestOptions.priority()).build());
-    }
-    Options opts = Options.fromTransactionOptions(transactionOptions);
-    if (opts.hasTag()) {
-      requestBuilder.setRequestOptions(
-          RequestOptions.newBuilder().setTransactionTag(opts.tag()).build());
+    if (commitRequestOptions.hasPriority() || commitRequestOptions.hasTag()) {
+      RequestOptions.Builder requestOptionsBuilder = RequestOptions.newBuilder();
+      if (commitRequestOptions.hasPriority()) {
+        requestOptionsBuilder.setPriority(commitRequestOptions.priority());
+      }
+      if (commitRequestOptions.hasTag()) {
+        requestOptionsBuilder.setTransactionTag(commitRequestOptions.tag());
+      }
+      requestBuilder.setRequestOptions(requestOptionsBuilder.build());
     }
     Span span = tracer.spanBuilder(SpannerImpl.COMMIT).startSpan();
     try (Scope s = tracer.withSpan(span)) {
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
index df1a148d41..a6eb6160b2 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
@@ -299,9 +299,15 @@ ApiFuture commitAsync() {
           CommitRequest.newBuilder()
               .setSession(session.getName())
               .setReturnCommitStats(options.withCommitStats());
-      if (options.hasPriority()) {
-        builder.setRequestOptions(
-            RequestOptions.newBuilder().setPriority(options.priority()).build());
+      if (options.hasPriority() || getTransactionTag() != null) {
+        RequestOptions.Builder requestOptionsBuilder = RequestOptions.newBuilder();
+        if (options.hasPriority()) {
+          requestOptionsBuilder.setPriority(options.priority());
+        }
+        if (getTransactionTag() != null) {
+          requestOptionsBuilder.setTransactionTag(getTransactionTag());
+        }
+        builder.setRequestOptions(requestOptionsBuilder.build());
       }
       synchronized (lock) {
         if (transactionIdFuture == null && transactionId == null && runningAsyncOperations == 0) {
@@ -349,13 +355,15 @@ public void run() {
             requestBuilder.setTransactionId(
                 transactionId == null ? transactionIdFuture.get() : transactionId);
           }
-          if (options.hasPriority()) {
-            requestBuilder.setRequestOptions(
-                RequestOptions.newBuilder().setPriority(options.priority()).build());
-          }
-          if (options.hasTag()) {
-            requestBuilder.setRequestOptions(
-                RequestOptions.newBuilder().setTransactionTag(options.tag()).build());
+          if (options.hasPriority() || getTransactionTag() != null) {
+            RequestOptions.Builder requestOptionsBuilder = RequestOptions.newBuilder();
+            if (options.hasPriority()) {
+              requestOptionsBuilder.setPriority(options.priority());
+            }
+            if (getTransactionTag() != null) {
+              requestOptionsBuilder.setTransactionTag(getTransactionTag());
+            }
+            requestBuilder.setRequestOptions(requestOptionsBuilder.build());
           }
           final CommitRequest commitRequest = requestBuilder.build();
           span.addAnnotation("Starting Commit");
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java
index 195dbb8225..61ab806f35 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractReadContextTest.java
@@ -94,7 +94,7 @@ TransactionSelector getTransactionSelector() {
     }
 
     String getTransactionTag() {
-      return "transaction-tag";
+      return "app=spanner,env=test";
     }
   }
 
@@ -192,11 +192,12 @@ public void executeSqlRequestBuilderWithRequestOptions() {
             .getExecuteSqlRequestBuilder(
                 Statement.newBuilder("SELECT FOO FROM BAR").build(),
                 QueryMode.NORMAL,
-                Options.fromUpdateOptions(Options.tag("tag-1")),
+                Options.fromUpdateOptions(Options.tag("app=spanner,env=test,action=query")),
                 false)
             .build();
     assertThat(request.getSql()).isEqualTo("SELECT FOO FROM BAR");
-    assertThat(request.getRequestOptions().getRequestTag()).isEqualTo("tag-1");
+    assertThat(request.getRequestOptions().getRequestTag())
+        .isEqualTo("app=spanner,env=test,action=query");
     assertThat(request.getRequestOptions().getTransactionTag()).isEmpty();
   }
 
@@ -218,11 +219,12 @@ public void executeSqlRequestBuilderWithRequestOptionsWithTxnTag() {
             .getExecuteSqlRequestBuilder(
                 Statement.newBuilder("SELECT FOO FROM BAR").build(),
                 QueryMode.NORMAL,
-                Options.fromUpdateOptions(Options.tag("tag-1")),
+                Options.fromUpdateOptions(Options.tag("app=spanner,env=test,action=query")),
                 false)
             .build();
     assertThat(request.getSql()).isEqualTo("SELECT FOO FROM BAR");
-    assertThat(request.getRequestOptions().getRequestTag()).isEqualTo("tag-1");
-    assertThat(request.getRequestOptions().getTransactionTag()).isEqualTo("transaction-tag");
+    assertThat(request.getRequestOptions().getRequestTag())
+        .isEqualTo("app=spanner,env=test,action=query");
+    assertThat(request.getRequestOptions().getTransactionTag()).isEqualTo("app=spanner,env=test");
   }
 }
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
index 138f34ddb8..2ce6c6e3b9 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
@@ -272,13 +272,283 @@ public void testWriteAtLeastOnceWithOptions() {
   }
 
   @Test
-  public void writeAtLeastOnceWithOptions() {
+  public void writeAtLeastOnceWithTagOptions() {
     DatabaseClient client =
         spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
     client.writeAtLeastOnceWithOptions(
         Arrays.asList(
             Mutation.newInsertBuilder("FOO").set("ID").to(1L).set("NAME").to("Bar").build()),
-        Options.tag("tag-1"));
+        Options.tag("app=spanner,env=test"));
+
+    List commitRequests = mockSpanner.getRequestsOfType(CommitRequest.class);
+    assertThat(commitRequests).hasSize(1);
+    CommitRequest commit = commitRequests.get(0);
+    assertNotNull(commit.getSingleUseTransaction());
+    assertTrue(commit.getSingleUseTransaction().hasReadWrite());
+    assertNotNull(commit.getRequestOptions());
+    assertEquals("app=spanner,env=test", commit.getRequestOptions().getTransactionTag());
+    assertEquals("", commit.getRequestOptions().getRequestTag());
+  }
+
+  @Test
+  public void testExecuteQueryWithTag() {
+    DatabaseClient client =
+        spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
+    try (ResultSet resultSet =
+        client
+            .singleUse()
+            .executeQuery(SELECT1, Options.tag("app=spanner,env=test,action=query"))) {
+      while (resultSet.next()) {}
+    }
+
+    List requests = mockSpanner.getRequestsOfType(ExecuteSqlRequest.class);
+    assertThat(requests).hasSize(1);
+    ExecuteSqlRequest request = requests.get(0);
+    assertNotNull(request.getRequestOptions());
+    assertEquals("app=spanner,env=test,action=query", request.getRequestOptions().getRequestTag());
+    assertEquals("", request.getRequestOptions().getTransactionTag());
+  }
+
+  @Test
+  public void testExecuteReadWithTag() {
+    DatabaseClient client =
+        spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
+    try (ResultSet resultSet =
+        client
+            .singleUse()
+            .read(
+                READ_TABLE_NAME,
+                KeySet.singleKey(Key.of(1L)),
+                READ_COLUMN_NAMES,
+                Options.tag("app=spanner,env=test,action=read"))) {
+      while (resultSet.next()) {}
+    }
+
+    List requests = mockSpanner.getRequestsOfType(ReadRequest.class);
+    assertThat(requests).hasSize(1);
+    ReadRequest request = requests.get(0);
+    assertNotNull(request.getRequestOptions());
+    assertEquals("app=spanner,env=test,action=read", request.getRequestOptions().getRequestTag());
+    assertEquals("", request.getRequestOptions().getTransactionTag());
+  }
+
+  @Test
+  public void testReadWriteExecuteQueryWithTag() {
+    DatabaseClient client =
+        spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
+    TransactionRunner runner =
+        client.readWriteTransaction(Options.tag("app=spanner,env=test,action=txn"));
+    runner.run(
+        new TransactionCallable() {
+          @Override
+          public Void run(TransactionContext transaction) throws Exception {
+            try (ResultSet resultSet =
+                transaction.executeQuery(
+                    SELECT1, Options.tag("app=spanner,env=test,action=query"))) {
+              while (resultSet.next()) {}
+            }
+            return null;
+          }
+        });
+
+    List requests = mockSpanner.getRequestsOfType(ExecuteSqlRequest.class);
+    assertThat(requests).hasSize(1);
+    ExecuteSqlRequest request = requests.get(0);
+    assertNotNull(request.getRequestOptions());
+    assertEquals("app=spanner,env=test,action=query", request.getRequestOptions().getRequestTag());
+    assertEquals(
+        "app=spanner,env=test,action=txn", request.getRequestOptions().getTransactionTag());
+  }
+
+  @Test
+  public void testReadWriteExecuteReadWithTag() {
+    DatabaseClient client =
+        spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
+    TransactionRunner runner =
+        client.readWriteTransaction(Options.tag("app=spanner,env=test,action=txn"));
+    runner.run(
+        new TransactionCallable() {
+          @Override
+          public Void run(TransactionContext transaction) throws Exception {
+            try (ResultSet resultSet =
+                transaction.read(
+                    READ_TABLE_NAME,
+                    KeySet.singleKey(Key.of(1L)),
+                    READ_COLUMN_NAMES,
+                    Options.tag("app=spanner,env=test,action=read"))) {
+              while (resultSet.next()) {}
+            }
+            return null;
+          }
+        });
+
+    List requests = mockSpanner.getRequestsOfType(ReadRequest.class);
+    assertThat(requests).hasSize(1);
+    ReadRequest request = requests.get(0);
+    assertNotNull(request.getRequestOptions());
+    assertEquals("app=spanner,env=test,action=read", request.getRequestOptions().getRequestTag());
+    assertEquals(
+        "app=spanner,env=test,action=txn", request.getRequestOptions().getTransactionTag());
+  }
+
+  @Test
+  public void testExecuteUpdateWithTag() {
+    DatabaseClient client =
+        spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
+    TransactionRunner runner = client.readWriteTransaction();
+    runner.run(
+        new TransactionCallable() {
+          @Override
+          public Long run(TransactionContext transaction) throws Exception {
+            return transaction.executeUpdate(
+                UPDATE_STATEMENT, Options.tag("app=spanner,env=test,action=update"));
+          }
+        });
+
+    List requests = mockSpanner.getRequestsOfType(ExecuteSqlRequest.class);
+    assertThat(requests).hasSize(1);
+    ExecuteSqlRequest request = requests.get(0);
+    assertNotNull(request.getRequestOptions());
+    assertEquals("app=spanner,env=test,action=update", request.getRequestOptions().getRequestTag());
+    assertEquals("", request.getRequestOptions().getTransactionTag());
+  }
+
+  @Test
+  public void testBatchUpdateWithTag() {
+    DatabaseClient client =
+        spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
+    TransactionRunner runner =
+        client.readWriteTransaction(Options.tag("app=spanner,env=test,action=txn"));
+    runner.run(
+        new TransactionCallable() {
+          @Override
+          public long[] run(TransactionContext transaction) throws Exception {
+            return transaction.batchUpdate(
+                Arrays.asList(UPDATE_STATEMENT), Options.tag("app=spanner,env=test,action=batch"));
+          }
+        });
+
+    List requests =
+        mockSpanner.getRequestsOfType(ExecuteBatchDmlRequest.class);
+    assertThat(requests).hasSize(1);
+    ExecuteBatchDmlRequest request = requests.get(0);
+    assertNotNull(request.getRequestOptions());
+    assertEquals("app=spanner,env=test,action=batch", request.getRequestOptions().getRequestTag());
+    assertEquals(
+        "app=spanner,env=test,action=txn", request.getRequestOptions().getTransactionTag());
+  }
+
+  @Test
+  public void testPartitionedDMLWithTag() {
+    DatabaseClient client =
+        spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
+    client.executePartitionedUpdate(
+        UPDATE_STATEMENT, Options.tag("app=spanner,env=test,action=dml"));
+
+    List requests = mockSpanner.getRequestsOfType(ExecuteSqlRequest.class);
+    assertThat(requests).hasSize(1);
+    ExecuteSqlRequest request = requests.get(0);
+    assertNotNull(request.getRequestOptions());
+    assertEquals("app=spanner,env=test,action=dml", request.getRequestOptions().getRequestTag());
+    assertEquals("", request.getRequestOptions().getTransactionTag());
+  }
+
+  @Test
+  public void testCommitWithTag() {
+    DatabaseClient client =
+        spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
+    TransactionRunner runner =
+        client.readWriteTransaction(Options.tag("app=spanner,env=test,action=commit"));
+    runner.run(
+        new TransactionCallable() {
+          @Override
+          public Void run(TransactionContext transaction) throws Exception {
+            transaction.buffer(Mutation.delete("TEST", KeySet.all()));
+            return null;
+          }
+        });
+
+    List requests = mockSpanner.getRequestsOfType(CommitRequest.class);
+    assertThat(requests).hasSize(1);
+    CommitRequest request = requests.get(0);
+    assertNotNull(request.getRequestOptions());
+    assertEquals("", request.getRequestOptions().getRequestTag());
+    assertEquals(
+        "app=spanner,env=test,action=commit", request.getRequestOptions().getTransactionTag());
+  }
+
+  @Test
+  public void testTransactionManagerCommitWithTag() {
+    DatabaseClient client =
+        spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
+    TransactionManager manager =
+        client.transactionManager(Options.tag("app=spanner,env=test,action=manager"));
+    TransactionContext transaction = manager.begin();
+    transaction.buffer(Mutation.delete("TEST", KeySet.all()));
+    manager.commit();
+
+    List requests = mockSpanner.getRequestsOfType(CommitRequest.class);
+    assertThat(requests).hasSize(1);
+    CommitRequest request = requests.get(0);
+    assertNotNull(request.getRequestOptions());
+    assertEquals("", request.getRequestOptions().getRequestTag());
+    assertEquals(
+        "app=spanner,env=test,action=manager", request.getRequestOptions().getTransactionTag());
+  }
+
+  @Test
+  public void testAsyncRunnerCommitWithTag() {
+    DatabaseClient client =
+        spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
+    AsyncRunner runner = client.runAsync(Options.tag("app=spanner,env=test,action=runner"));
+    get(
+        runner.runAsync(
+            new AsyncWork() {
+              @Override
+              public ApiFuture doWorkAsync(TransactionContext txn) {
+                txn.buffer(Mutation.delete("TEST", KeySet.all()));
+                return ApiFutures.immediateFuture(null);
+              }
+            },
+            executor));
+
+    List requests = mockSpanner.getRequestsOfType(CommitRequest.class);
+    assertThat(requests).hasSize(1);
+    CommitRequest request = requests.get(0);
+    assertNotNull(request.getRequestOptions());
+    assertEquals("", request.getRequestOptions().getRequestTag());
+    assertEquals(
+        "app=spanner,env=test,action=runner", request.getRequestOptions().getTransactionTag());
+  }
+
+  @Test
+  public void testAsyncTransactionManagerCommitWithTag() {
+    DatabaseClient client =
+        spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
+    try (AsyncTransactionManager manager =
+        client.transactionManagerAsync(Options.tag("app=spanner,env=test,action=manager"))) {
+      TransactionContextFuture transaction = manager.beginAsync();
+      get(
+          transaction
+              .then(
+                  new AsyncTransactionFunction() {
+                    @Override
+                    public ApiFuture apply(TransactionContext txn, Void input)
+                        throws Exception {
+                      txn.buffer(Mutation.delete("TEST", KeySet.all()));
+                      return ApiFutures.immediateFuture(null);
+                    }
+                  },
+                  executor)
+              .commitAsync());
+    }
+
+    List requests = mockSpanner.getRequestsOfType(CommitRequest.class);
+    assertThat(requests).hasSize(1);
+    CommitRequest request = requests.get(0);
+    assertNotNull(request.getRequestOptions());
+    assertEquals(
+        "app=spanner,env=test,action=manager", request.getRequestOptions().getTransactionTag());
   }
 
   @Test
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
index 84653e898d..363110b853 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
@@ -518,14 +518,15 @@ public void testTransactionOptionsPriorityEquality() {
     assertNotEquals(options2, options4);
   }
 
+  @Test
   public void updateOptTest() {
-    String tag = "tag-1";
+    String tag = "app=spanner,env=test";
     Options opts = Options.fromUpdateOptions(Options.tag(tag));
 
     assertThat(opts.toString()).isEqualTo("tag: " + tag + " ");
     assertThat(opts.hasTag()).isTrue();
     assertThat(opts.tag()).isEqualTo(tag);
-    assertThat(opts.hashCode()).isEqualTo(110119551);
+    assertThat(opts.hashCode()).isEqualTo(-2118248262);
   }
 
   @Test
@@ -538,26 +539,26 @@ public void updateEquality() {
     o2 = Options.fromUpdateOptions();
     assertThat(o1.equals(o2)).isTrue();
 
-    o2 = Options.fromUpdateOptions(Options.tag("tag-1"));
+    o2 = Options.fromUpdateOptions(Options.tag("app=spanner,env=test"));
     assertThat(o1.equals(o2)).isFalse();
     assertThat(o2.equals(o1)).isFalse();
 
-    o3 = Options.fromUpdateOptions(Options.tag("tag-1"));
+    o3 = Options.fromUpdateOptions(Options.tag("app=spanner,env=test"));
     assertThat(o2.equals(o3)).isTrue();
 
-    o3 = Options.fromUpdateOptions(Options.tag("tag-2"));
+    o3 = Options.fromUpdateOptions(Options.tag("app=spanner,env=stage"));
     assertThat(o2.equals(o3)).isFalse();
   }
 
   @Test
   public void transactionOptTest() {
-    String tag = "tag-1";
+    String tag = "app=spanner,env=test";
     Options opts = Options.fromTransactionOptions(Options.tag(tag));
 
     assertThat(opts.toString()).isEqualTo("tag: " + tag + " ");
     assertThat(opts.hasTag()).isTrue();
     assertThat(opts.tag()).isEqualTo(tag);
-    assertThat(opts.hashCode()).isEqualTo(110119551);
+    assertThat(opts.hashCode()).isEqualTo(-2118248262);
   }
 
   @Test
@@ -570,14 +571,14 @@ public void transactionEquality() {
     o2 = Options.fromTransactionOptions();
     assertThat(o1.equals(o2)).isTrue();
 
-    o2 = Options.fromTransactionOptions(Options.tag("tag-1"));
+    o2 = Options.fromTransactionOptions(Options.tag("app=spanner,env=test"));
     assertThat(o1.equals(o2)).isFalse();
     assertThat(o2.equals(o1)).isFalse();
 
-    o3 = Options.fromTransactionOptions(Options.tag("tag-1"));
+    o3 = Options.fromTransactionOptions(Options.tag("app=spanner,env=test"));
     assertThat(o2.equals(o3)).isTrue();
 
-    o3 = Options.fromTransactionOptions(Options.tag("tag-2"));
+    o3 = Options.fromTransactionOptions(Options.tag("app=spanner,env=stage"));
     assertThat(o2.equals(o3)).isFalse();
   }
 }
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java
index e18cf8de77..a97609172a 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java
@@ -67,7 +67,7 @@ public class PartitionedDmlTransactionTest {
   private final ByteString txId = ByteString.copyFromUtf8("tx");
   private final ByteString resumeToken = ByteString.copyFromUtf8("resume");
   private final String sql = "UPDATE FOO SET BAR=1 WHERE TRUE";
-  private final String tag = "tag-1";
+  private final String tag = "app=spanner,env=test";
   private final ExecuteSqlRequest executeRequestWithoutResumeToken =
       ExecuteSqlRequest.newBuilder()
           .setQueryMode(QueryMode.NORMAL)
@@ -383,4 +383,14 @@ public void testRequestWithPriority() {
             Options.fromUpdateOptions(Options.priority(RpcPriority.LOW)));
     assertEquals(Priority.PRIORITY_LOW, request.getRequestOptions().getPriority());
   }
+
+  @Test
+  public void testRequestWithPriorityAndRequestTag() {
+    ExecuteSqlRequest request =
+        tx.newTransactionRequestFrom(
+            Statement.of("UPDATE FOO SET BAR=1 WHERE TRUE"),
+            Options.fromUpdateOptions(Options.priority(RpcPriority.LOW), Options.tag("tag")));
+    assertEquals(Priority.PRIORITY_LOW, request.getRequestOptions().getPriority());
+    assertEquals("tag", request.getRequestOptions().getRequestTag());
+  }
 }
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java
index acabba3d38..5388af76c4 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java
@@ -242,7 +242,7 @@ public void writeAtLeastOnce() throws ParseException {
 
   @Test
   public void writeAtLeastOnceWithOptions() throws ParseException {
-    String tag = "tag-1";
+    String tag = "app=spanner,env=test";
     String timestampString = "2015-10-01T10:54:20.021Z";
     ArgumentCaptor commit = ArgumentCaptor.forClass(CommitRequest.class);
     CommitResponse response =

From 1ae31ed8cd5e39d037772a711fa7e4d6860806d7 Mon Sep 17 00:00:00 2001
From: Mayur Kale 
Date: Wed, 31 Mar 2021 15:05:40 -0700
Subject: [PATCH 11/12] chore: minor style fix

---
 .../cloud/spanner/DatabaseClientImplTest.java | 68 +++++++++++--------
 .../com/google/cloud/spanner/OptionsTest.java |  8 +--
 .../PartitionedDmlTransactionTest.java        |  5 +-
 3 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
index 2ce6c6e3b9..8c66b78ef3 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
@@ -286,8 +286,8 @@ public void writeAtLeastOnceWithTagOptions() {
     assertNotNull(commit.getSingleUseTransaction());
     assertTrue(commit.getSingleUseTransaction().hasReadWrite());
     assertNotNull(commit.getRequestOptions());
-    assertEquals("app=spanner,env=test", commit.getRequestOptions().getTransactionTag());
-    assertEquals("", commit.getRequestOptions().getRequestTag());
+    assertThat(commit.getRequestOptions().getTransactionTag()).isEqualTo("app=spanner,env=test");
+    assertThat(commit.getRequestOptions().getRequestTag()).isEmpty();
   }
 
   @Test
@@ -305,8 +305,9 @@ public void testExecuteQueryWithTag() {
     assertThat(requests).hasSize(1);
     ExecuteSqlRequest request = requests.get(0);
     assertNotNull(request.getRequestOptions());
-    assertEquals("app=spanner,env=test,action=query", request.getRequestOptions().getRequestTag());
-    assertEquals("", request.getRequestOptions().getTransactionTag());
+    assertThat(request.getRequestOptions().getRequestTag())
+        .isEqualTo("app=spanner,env=test,action=query");
+    assertThat(request.getRequestOptions().getTransactionTag()).isEmpty();
   }
 
   @Test
@@ -328,8 +329,9 @@ public void testExecuteReadWithTag() {
     assertThat(requests).hasSize(1);
     ReadRequest request = requests.get(0);
     assertNotNull(request.getRequestOptions());
-    assertEquals("app=spanner,env=test,action=read", request.getRequestOptions().getRequestTag());
-    assertEquals("", request.getRequestOptions().getTransactionTag());
+    assertThat(request.getRequestOptions().getRequestTag())
+        .isEqualTo("app=spanner,env=test,action=read");
+    assertThat(request.getRequestOptions().getTransactionTag()).isEmpty();
   }
 
   @Test
@@ -355,9 +357,10 @@ public Void run(TransactionContext transaction) throws Exception {
     assertThat(requests).hasSize(1);
     ExecuteSqlRequest request = requests.get(0);
     assertNotNull(request.getRequestOptions());
-    assertEquals("app=spanner,env=test,action=query", request.getRequestOptions().getRequestTag());
-    assertEquals(
-        "app=spanner,env=test,action=txn", request.getRequestOptions().getTransactionTag());
+    assertThat(request.getRequestOptions().getRequestTag())
+        .isEqualTo("app=spanner,env=test,action=query");
+    assertThat(request.getRequestOptions().getTransactionTag())
+        .isEqualTo("app=spanner,env=test,action=txn");
   }
 
   @Test
@@ -386,9 +389,10 @@ public Void run(TransactionContext transaction) throws Exception {
     assertThat(requests).hasSize(1);
     ReadRequest request = requests.get(0);
     assertNotNull(request.getRequestOptions());
-    assertEquals("app=spanner,env=test,action=read", request.getRequestOptions().getRequestTag());
-    assertEquals(
-        "app=spanner,env=test,action=txn", request.getRequestOptions().getTransactionTag());
+    assertThat(request.getRequestOptions().getRequestTag())
+        .isEqualTo("app=spanner,env=test,action=read");
+    assertThat(request.getRequestOptions().getTransactionTag())
+        .isEqualTo("app=spanner,env=test,action=txn");
   }
 
   @Test
@@ -409,8 +413,9 @@ public Long run(TransactionContext transaction) throws Exception {
     assertThat(requests).hasSize(1);
     ExecuteSqlRequest request = requests.get(0);
     assertNotNull(request.getRequestOptions());
-    assertEquals("app=spanner,env=test,action=update", request.getRequestOptions().getRequestTag());
-    assertEquals("", request.getRequestOptions().getTransactionTag());
+    assertThat(request.getRequestOptions().getRequestTag())
+        .isEqualTo("app=spanner,env=test,action=update");
+    assertThat(request.getRequestOptions().getTransactionTag()).isEmpty();
   }
 
   @Test
@@ -433,9 +438,10 @@ public long[] run(TransactionContext transaction) throws Exception {
     assertThat(requests).hasSize(1);
     ExecuteBatchDmlRequest request = requests.get(0);
     assertNotNull(request.getRequestOptions());
-    assertEquals("app=spanner,env=test,action=batch", request.getRequestOptions().getRequestTag());
-    assertEquals(
-        "app=spanner,env=test,action=txn", request.getRequestOptions().getTransactionTag());
+    assertThat(request.getRequestOptions().getRequestTag())
+        .isEqualTo("app=spanner,env=test,action=batch");
+    assertThat(request.getRequestOptions().getTransactionTag())
+        .isEqualTo("app=spanner,env=test,action=txn");
   }
 
   @Test
@@ -449,8 +455,9 @@ public void testPartitionedDMLWithTag() {
     assertThat(requests).hasSize(1);
     ExecuteSqlRequest request = requests.get(0);
     assertNotNull(request.getRequestOptions());
-    assertEquals("app=spanner,env=test,action=dml", request.getRequestOptions().getRequestTag());
-    assertEquals("", request.getRequestOptions().getTransactionTag());
+    assertThat(request.getRequestOptions().getRequestTag())
+        .isEqualTo("app=spanner,env=test,action=dml");
+    assertThat(request.getRequestOptions().getTransactionTag()).isEmpty();
   }
 
   @Test
@@ -472,9 +479,9 @@ public Void run(TransactionContext transaction) throws Exception {
     assertThat(requests).hasSize(1);
     CommitRequest request = requests.get(0);
     assertNotNull(request.getRequestOptions());
-    assertEquals("", request.getRequestOptions().getRequestTag());
-    assertEquals(
-        "app=spanner,env=test,action=commit", request.getRequestOptions().getTransactionTag());
+    assertThat(request.getRequestOptions().getRequestTag()).isEmpty();
+    assertThat(request.getRequestOptions().getTransactionTag())
+        .isEqualTo("app=spanner,env=test,action=commit");
   }
 
   @Test
@@ -491,9 +498,9 @@ public void testTransactionManagerCommitWithTag() {
     assertThat(requests).hasSize(1);
     CommitRequest request = requests.get(0);
     assertNotNull(request.getRequestOptions());
-    assertEquals("", request.getRequestOptions().getRequestTag());
-    assertEquals(
-        "app=spanner,env=test,action=manager", request.getRequestOptions().getTransactionTag());
+    assertThat(request.getRequestOptions().getRequestTag()).isEmpty();
+    assertThat(request.getRequestOptions().getTransactionTag())
+        .isEqualTo("app=spanner,env=test,action=manager");
   }
 
   @Test
@@ -516,9 +523,9 @@ public ApiFuture doWorkAsync(TransactionContext txn) {
     assertThat(requests).hasSize(1);
     CommitRequest request = requests.get(0);
     assertNotNull(request.getRequestOptions());
-    assertEquals("", request.getRequestOptions().getRequestTag());
-    assertEquals(
-        "app=spanner,env=test,action=runner", request.getRequestOptions().getTransactionTag());
+    assertThat(request.getRequestOptions().getRequestTag()).isEmpty();
+    assertThat(request.getRequestOptions().getTransactionTag())
+        .isEqualTo("app=spanner,env=test,action=runner");
   }
 
   @Test
@@ -547,8 +554,9 @@ public ApiFuture apply(TransactionContext txn, Void input)
     assertThat(requests).hasSize(1);
     CommitRequest request = requests.get(0);
     assertNotNull(request.getRequestOptions());
-    assertEquals(
-        "app=spanner,env=test,action=manager", request.getRequestOptions().getTransactionTag());
+    assertThat(request.getRequestOptions().getRequestTag()).isEmpty();
+    assertThat(request.getRequestOptions().getTransactionTag())
+        .isEqualTo("app=spanner,env=test,action=manager");
   }
 
   @Test
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
index 363110b853..14bde7c3df 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
@@ -171,13 +171,13 @@ public void listEquality() {
   @Test
   public void readOptTest() {
     int limit = 3;
-    String tag = "read";
+    String tag = "app=spanner,env=test,action=read";
     Options opts = Options.fromReadOptions(Options.limit(limit), Options.tag(tag));
 
     assertThat(opts.toString())
         .isEqualTo("limit: " + Integer.toString(limit) + " " + "tag: " + tag + " ");
     assertThat(opts.tag()).isEqualTo(tag);
-    assertThat(opts.hashCode()).isEqualTo(3526226);
+    assertThat(opts.hashCode()).isEqualTo(-1111478426);
   }
 
   @Test
@@ -204,13 +204,13 @@ public void readEquality() {
   @Test
   public void queryOptTest() {
     int chunks = 3;
-    String tag = "query";
+    String tag = "app=spanner,env=test,action=query";
     Options opts = Options.fromQueryOptions(Options.prefetchChunks(chunks), Options.tag(tag));
     assertThat(opts.toString())
         .isEqualTo("prefetchChunks: " + Integer.toString(chunks) + " " + "tag: " + tag + " ");
     assertThat(opts.prefetchChunks()).isEqualTo(chunks);
     assertThat(opts.tag()).isEqualTo(tag);
-    assertThat(opts.hashCode()).isEqualTo(107974020);
+    assertThat(opts.hashCode()).isEqualTo(-97431824);
   }
 
   @Test
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java
index a97609172a..1ca4b85319 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java
@@ -389,8 +389,9 @@ public void testRequestWithPriorityAndRequestTag() {
     ExecuteSqlRequest request =
         tx.newTransactionRequestFrom(
             Statement.of("UPDATE FOO SET BAR=1 WHERE TRUE"),
-            Options.fromUpdateOptions(Options.priority(RpcPriority.LOW), Options.tag("tag")));
+            Options.fromUpdateOptions(
+                Options.priority(RpcPriority.LOW), Options.tag("app=spanner,env=test")));
     assertEquals(Priority.PRIORITY_LOW, request.getRequestOptions().getPriority());
-    assertEquals("tag", request.getRequestOptions().getRequestTag());
+    assertThat(request.getRequestOptions().getRequestTag()).isEqualTo("app=spanner,env=test");
   }
 }

From 6bb97a46432e66c4238e482a92738c5a41cd41f6 Mon Sep 17 00:00:00 2001
From: Mayur Kale 
Date: Thu, 1 Apr 2021 11:48:32 -0700
Subject: [PATCH 12/12] chore: fix code reviews

---
 .../com/google/cloud/spanner/OptionsTest.java | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
index 14bde7c3df..d0f4794ccd 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
@@ -101,15 +101,15 @@ public void allOptionsAbsent() {
   }
 
   @Test
-  public void listOptTest() {
+  public void listOptionsTest() {
     int pageSize = 3;
     String pageToken = "ptok";
     String filter = "env";
-    Options opts =
+    Options options =
         Options.fromListOptions(
             Options.pageSize(pageSize), Options.pageToken(pageToken), Options.filter(filter));
 
-    assertThat(opts.toString())
+    assertThat(options.toString())
         .isEqualTo(
             "pageSize: "
                 + Integer.toString(pageSize)
@@ -119,14 +119,14 @@ public void listOptTest() {
                 + filter
                 + " ");
 
-    assertThat(opts.hasPageSize()).isTrue();
-    assertThat(opts.hasPageToken()).isTrue();
-    assertThat(opts.hasFilter()).isTrue();
+    assertThat(options.hasPageSize()).isTrue();
+    assertThat(options.hasPageToken()).isTrue();
+    assertThat(options.hasFilter()).isTrue();
 
-    assertThat(opts.pageSize()).isEqualTo(pageSize);
-    assertThat(opts.pageToken()).isEqualTo(pageToken);
-    assertThat(opts.filter()).isEqualTo(filter);
-    assertThat(opts.hashCode()).isEqualTo(108027089);
+    assertThat(options.pageSize()).isEqualTo(pageSize);
+    assertThat(options.pageToken()).isEqualTo(pageToken);
+    assertThat(options.filter()).isEqualTo(filter);
+    assertThat(options.hashCode()).isEqualTo(108027089);
   }
 
   @Test
@@ -169,15 +169,15 @@ public void listEquality() {
   }
 
   @Test
-  public void readOptTest() {
+  public void readOptionsTest() {
     int limit = 3;
     String tag = "app=spanner,env=test,action=read";
-    Options opts = Options.fromReadOptions(Options.limit(limit), Options.tag(tag));
+    Options options = Options.fromReadOptions(Options.limit(limit), Options.tag(tag));
 
-    assertThat(opts.toString())
+    assertThat(options.toString())
         .isEqualTo("limit: " + Integer.toString(limit) + " " + "tag: " + tag + " ");
-    assertThat(opts.tag()).isEqualTo(tag);
-    assertThat(opts.hashCode()).isEqualTo(-1111478426);
+    assertThat(options.tag()).isEqualTo(tag);
+    assertThat(options.hashCode()).isEqualTo(-1111478426);
   }
 
   @Test
@@ -202,15 +202,15 @@ public void readEquality() {
   }
 
   @Test
-  public void queryOptTest() {
+  public void queryOptionsTest() {
     int chunks = 3;
     String tag = "app=spanner,env=test,action=query";
-    Options opts = Options.fromQueryOptions(Options.prefetchChunks(chunks), Options.tag(tag));
-    assertThat(opts.toString())
+    Options options = Options.fromQueryOptions(Options.prefetchChunks(chunks), Options.tag(tag));
+    assertThat(options.toString())
         .isEqualTo("prefetchChunks: " + Integer.toString(chunks) + " " + "tag: " + tag + " ");
-    assertThat(opts.prefetchChunks()).isEqualTo(chunks);
-    assertThat(opts.tag()).isEqualTo(tag);
-    assertThat(opts.hashCode()).isEqualTo(-97431824);
+    assertThat(options.prefetchChunks()).isEqualTo(chunks);
+    assertThat(options.tag()).isEqualTo(tag);
+    assertThat(options.hashCode()).isEqualTo(-97431824);
   }
 
   @Test
@@ -236,8 +236,8 @@ public void queryEquality() {
 
   @Test
   public void testFromTransactionOptions_toStringNoOptions() {
-    Options opts = Options.fromTransactionOptions();
-    assertThat(opts.toString()).isEqualTo("");
+    Options options = Options.fromTransactionOptions();
+    assertThat(options.toString()).isEqualTo("");
   }
 
   @Test
@@ -492,9 +492,9 @@ public void testFromUpdateOptions() {
   @Test
   public void testTransactionOptions() {
     RpcPriority prio = RpcPriority.HIGH;
-    Options opts = Options.fromTransactionOptions(Options.priority(prio));
-    assertThat(opts.toString()).isEqualTo("priority: " + prio + " ");
-    assertThat(opts.priority()).isEqualTo(Priority.PRIORITY_HIGH);
+    Options options = Options.fromTransactionOptions(Options.priority(prio));
+    assertThat(options.toString()).isEqualTo("priority: " + prio + " ");
+    assertThat(options.priority()).isEqualTo(Priority.PRIORITY_HIGH);
   }
 
   @Test
@@ -519,14 +519,14 @@ public void testTransactionOptionsPriorityEquality() {
   }
 
   @Test
-  public void updateOptTest() {
+  public void updateOptionsTest() {
     String tag = "app=spanner,env=test";
-    Options opts = Options.fromUpdateOptions(Options.tag(tag));
+    Options options = Options.fromUpdateOptions(Options.tag(tag));
 
-    assertThat(opts.toString()).isEqualTo("tag: " + tag + " ");
-    assertThat(opts.hasTag()).isTrue();
-    assertThat(opts.tag()).isEqualTo(tag);
-    assertThat(opts.hashCode()).isEqualTo(-2118248262);
+    assertEquals("tag: " + tag + " ", options.toString());
+    assertTrue(options.hasTag());
+    assertThat(options.tag()).isEqualTo(tag);
+    assertThat(options.hashCode()).isEqualTo(-2118248262);
   }
 
   @Test
@@ -551,14 +551,14 @@ public void updateEquality() {
   }
 
   @Test
-  public void transactionOptTest() {
+  public void transactionOptionsTest() {
     String tag = "app=spanner,env=test";
-    Options opts = Options.fromTransactionOptions(Options.tag(tag));
+    Options options = Options.fromTransactionOptions(Options.tag(tag));
 
-    assertThat(opts.toString()).isEqualTo("tag: " + tag + " ");
-    assertThat(opts.hasTag()).isTrue();
-    assertThat(opts.tag()).isEqualTo(tag);
-    assertThat(opts.hashCode()).isEqualTo(-2118248262);
+    assertEquals("tag: " + tag + " ", options.toString());
+    assertTrue(options.hasTag());
+    assertThat(options.tag()).isEqualTo(tag);
+    assertThat(options.hashCode()).isEqualTo(-2118248262);
   }
 
   @Test