diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d94732c2a..59e752cd73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.9.3](https://github.com/googleapis/java-firestore/compare/v3.9.2...v3.9.3) (2023-03-29)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.6.0 ([#1247](https://github.com/googleapis/java-firestore/issues/1247)) ([aa098e0](https://github.com/googleapis/java-firestore/commit/aa098e0966d46cf6e2206baab95f4acbfcbfbc92))
+
 ## [3.9.2](https://github.com/googleapis/java-firestore/compare/v3.9.1...v3.9.2) (2023-03-20)
 
 
diff --git a/README.md b/README.md
index 008b098b47..d519332bc5 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>26.10.0</version>
+      <version>26.11.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-firestore</artifactId>
-  <version>3.9.1</version>
+  <version>3.9.2</version>
 </dependency>
 
 ```
@@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.10.0')
+implementation platform('com.google.cloud:libraries-bom:26.11.0')
 
 implementation 'com.google.cloud:google-cloud-firestore'
 ```
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-firestore:3.9.1'
+implementation 'com.google.cloud:google-cloud-firestore:3.9.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.9.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.9.2"
 ```
 <!-- {x-version-update-end} -->
 
@@ -221,7 +221,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-firestore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.9.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.9.2
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/google-cloud-firestore-admin/pom.xml b/google-cloud-firestore-admin/pom.xml
index 114cab1683..c1987def39 100644
--- a/google-cloud-firestore-admin/pom.xml
+++ b/google-cloud-firestore-admin/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>google-cloud-firestore-admin</artifactId>
-  <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+  <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Firestore Admin Client</name>
   <url>https://github.com/googleapis/java-firestore</url>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-firestore-parent</artifactId>
-    <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/HttpJsonFirestoreAdminStub.java b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/HttpJsonFirestoreAdminStub.java
index 8dd2bfd13a..8fddccb4eb 100644
--- a/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/HttpJsonFirestoreAdminStub.java
+++ b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/HttpJsonFirestoreAdminStub.java
@@ -19,6 +19,7 @@
 import static com.google.cloud.firestore.v1.FirestoreAdminClient.ListFieldsPagedResponse;
 import static com.google.cloud.firestore.v1.FirestoreAdminClient.ListIndexesPagedResponse;
 
+import com.google.api.HttpRule;
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
@@ -34,6 +35,7 @@
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
 import com.google.api.gax.rpc.UnaryCallable;
+import com.google.common.collect.ImmutableMap;
 import com.google.firestore.admin.v1.CreateIndexRequest;
 import com.google.firestore.admin.v1.Database;
 import com.google.firestore.admin.v1.DeleteIndexRequest;
@@ -607,7 +609,32 @@ protected HttpJsonFirestoreAdminStub(
       throws IOException {
     this.callableFactory = callableFactory;
     this.httpJsonOperationsStub =
-        HttpJsonOperationsStub.create(clientContext, callableFactory, typeRegistry);
+        HttpJsonOperationsStub.create(
+            clientContext,
+            callableFactory,
+            typeRegistry,
+            ImmutableMap.<String, HttpRule>builder()
+                .put(
+                    "google.longrunning.Operations.CancelOperation",
+                    HttpRule.newBuilder()
+                        .setPost("/v1/{name=projects/*/databases/*/operations/*}:cancel")
+                        .build())
+                .put(
+                    "google.longrunning.Operations.DeleteOperation",
+                    HttpRule.newBuilder()
+                        .setDelete("/v1/{name=projects/*/databases/*/operations/*}")
+                        .build())
+                .put(
+                    "google.longrunning.Operations.GetOperation",
+                    HttpRule.newBuilder()
+                        .setGet("/v1/{name=projects/*/databases/*/operations/*}")
+                        .build())
+                .put(
+                    "google.longrunning.Operations.ListOperations",
+                    HttpRule.newBuilder()
+                        .setGet("/v1/{name=projects/*/databases/*}/operations")
+                        .build())
+                .build());
 
     HttpJsonCallSettings<CreateIndexRequest, Operation> createIndexTransportSettings =
         HttpJsonCallSettings.<CreateIndexRequest, Operation>newBuilder()
diff --git a/google-cloud-firestore-bom/pom.xml b/google-cloud-firestore-bom/pom.xml
index 9bc7ef69e4..20d0fcf4d6 100644
--- a/google-cloud-firestore-bom/pom.xml
+++ b/google-cloud-firestore-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-firestore-bom</artifactId>
-  <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
+  <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -52,37 +52,37 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-admin</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+        <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>3.9.3</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-firestore-v1</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>3.9.3</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>3.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-firestore-v1</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>3.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
+        <version>3.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml
index 301ed5e149..d322d4c296 100644
--- a/google-cloud-firestore/pom.xml
+++ b/google-cloud-firestore/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>google-cloud-firestore</artifactId>
-  <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
+  <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Firestore</name>
   <url>https://github.com/googleapis/java-firestore</url>
@@ -12,7 +12,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-firestore-parent</artifactId>
-    <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-firestore</site.installationModule>
@@ -162,7 +162,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-conformance-tests</artifactId>
-      <version>0.3.4</version>
+      <version>0.3.5</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/grpc-google-cloud-firestore-admin-v1/pom.xml b/grpc-google-cloud-firestore-admin-v1/pom.xml
index d5610aedb5..ac73c19c9a 100644
--- a/grpc-google-cloud-firestore-admin-v1/pom.xml
+++ b/grpc-google-cloud-firestore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
-    <version>3.9.2</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+    <version>3.9.3</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
     <name>grpc-google-cloud-firestore-admin-v1</name>
     <description>GRPC library for grpc-google-cloud-firestore-admin-v1</description>
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-parent</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/grpc-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FirestoreAdminGrpc.java b/grpc-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FirestoreAdminGrpc.java
index 9632d6baf6..db8aa0d672 100644
--- a/grpc-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FirestoreAdminGrpc.java
+++ b/grpc-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FirestoreAdminGrpc.java
@@ -643,7 +643,7 @@ public FirestoreAdminFutureStub newStub(
    * service `google.longrunning.Operations`.
    * </pre>
    */
-  public abstract static class FirestoreAdminImplBase implements io.grpc.BindableService {
+  public interface AsyncService {
 
     /**
      *
@@ -654,7 +654,7 @@ public abstract static class FirestoreAdminImplBase implements io.grpc.BindableS
      * the operation will be the type [IndexOperationMetadata][google.firestore.admin.v1.IndexOperationMetadata].
      * </pre>
      */
-    public void createIndex(
+    default void createIndex(
         com.google.firestore.admin.v1.CreateIndexRequest request,
         io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
@@ -668,7 +668,7 @@ public void createIndex(
      * Lists composite indexes.
      * </pre>
      */
-    public void listIndexes(
+    default void listIndexes(
         com.google.firestore.admin.v1.ListIndexesRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.admin.v1.ListIndexesResponse>
             responseObserver) {
@@ -683,7 +683,7 @@ public void listIndexes(
      * Gets a composite index.
      * </pre>
      */
-    public void getIndex(
+    default void getIndex(
         com.google.firestore.admin.v1.GetIndexRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.admin.v1.Index> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetIndexMethod(), responseObserver);
@@ -696,7 +696,7 @@ public void getIndex(
      * Deletes a composite index.
      * </pre>
      */
-    public void deleteIndex(
+    default void deleteIndex(
         com.google.firestore.admin.v1.DeleteIndexRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
@@ -710,7 +710,7 @@ public void deleteIndex(
      * Gets the metadata and configuration for a Field.
      * </pre>
      */
-    public void getField(
+    default void getField(
         com.google.firestore.admin.v1.GetFieldRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.admin.v1.Field> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetFieldMethod(), responseObserver);
@@ -733,7 +733,7 @@ public void getField(
      * `projects/{project_id}/databases/{database_id}/collectionGroups/__default__/fields/&#42;`.
      * </pre>
      */
-    public void updateField(
+    default void updateField(
         com.google.firestore.admin.v1.UpdateFieldRequest request,
         io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
@@ -751,7 +751,7 @@ public void updateField(
      * `indexConfig.usesAncestorConfig:false` .
      * </pre>
      */
-    public void listFields(
+    default void listFields(
         com.google.firestore.admin.v1.ListFieldsRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.admin.v1.ListFieldsResponse>
             responseObserver) {
@@ -774,7 +774,7 @@ public void listFields(
      * https://cloud.google.com/firestore/docs/manage-data/export-import
      * </pre>
      */
-    public void exportDocuments(
+    default void exportDocuments(
         com.google.firestore.admin.v1.ExportDocumentsRequest request,
         io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
@@ -792,7 +792,7 @@ public void exportDocuments(
      * that a subset of the data has already been imported to Cloud Firestore.
      * </pre>
      */
-    public void importDocuments(
+    default void importDocuments(
         com.google.firestore.admin.v1.ImportDocumentsRequest request,
         io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
@@ -806,7 +806,7 @@ public void importDocuments(
      * Gets information about a database.
      * </pre>
      */
-    public void getDatabase(
+    default void getDatabase(
         com.google.firestore.admin.v1.GetDatabaseRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.admin.v1.Database> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
@@ -820,7 +820,7 @@ public void getDatabase(
      * List all the databases in the project.
      * </pre>
      */
-    public void listDatabases(
+    default void listDatabases(
         com.google.firestore.admin.v1.ListDatabasesRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.admin.v1.ListDatabasesResponse>
             responseObserver) {
@@ -835,97 +835,51 @@ public void listDatabases(
      * Updates a database.
      * </pre>
      */
-    public void updateDatabase(
+    default void updateDatabase(
         com.google.firestore.admin.v1.UpdateDatabaseRequest request,
         io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
           getUpdateDatabaseMethod(), responseObserver);
     }
+  }
+
+  /**
+   * Base class for the server implementation of the service FirestoreAdmin.
+   *
+   * <pre>
+   * The Cloud Firestore Admin API.
+   * This API provides several administrative services for Cloud Firestore.
+   * Project, Database, Namespace, Collection, Collection Group, and Document are
+   * used as defined in the Google Cloud Firestore API.
+   * Operation: An Operation represents work being performed in the background.
+   * The index service manages Cloud Firestore indexes.
+   * Index creation is performed asynchronously.
+   * An Operation resource is created for each such asynchronous operation.
+   * The state of the operation (including any errors encountered)
+   * may be queried via the Operation resource.
+   * The Operations collection provides a record of actions performed for the
+   * specified Project (including any Operations in progress). Operations are not
+   * created directly but through calls on other collections or resources.
+   * An Operation that is done may be deleted so that it is no longer listed as
+   * part of the Operation collection. Operations are garbage collected after
+   * 30 days. By default, ListOperations will only return in progress and failed
+   * operations. To list completed operation, issue a ListOperations request with
+   * the filter `done: true`.
+   * Operations are created by service `FirestoreAdmin`, but are accessed via
+   * service `google.longrunning.Operations`.
+   * </pre>
+   */
+  public abstract static class FirestoreAdminImplBase
+      implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override
     public final io.grpc.ServerServiceDefinition bindService() {
-      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
-          .addMethod(
-              getCreateIndexMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.admin.v1.CreateIndexRequest,
-                      com.google.longrunning.Operation>(this, METHODID_CREATE_INDEX)))
-          .addMethod(
-              getListIndexesMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.admin.v1.ListIndexesRequest,
-                      com.google.firestore.admin.v1.ListIndexesResponse>(
-                      this, METHODID_LIST_INDEXES)))
-          .addMethod(
-              getGetIndexMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.admin.v1.GetIndexRequest,
-                      com.google.firestore.admin.v1.Index>(this, METHODID_GET_INDEX)))
-          .addMethod(
-              getDeleteIndexMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.admin.v1.DeleteIndexRequest, com.google.protobuf.Empty>(
-                      this, METHODID_DELETE_INDEX)))
-          .addMethod(
-              getGetFieldMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.admin.v1.GetFieldRequest,
-                      com.google.firestore.admin.v1.Field>(this, METHODID_GET_FIELD)))
-          .addMethod(
-              getUpdateFieldMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.admin.v1.UpdateFieldRequest,
-                      com.google.longrunning.Operation>(this, METHODID_UPDATE_FIELD)))
-          .addMethod(
-              getListFieldsMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.admin.v1.ListFieldsRequest,
-                      com.google.firestore.admin.v1.ListFieldsResponse>(
-                      this, METHODID_LIST_FIELDS)))
-          .addMethod(
-              getExportDocumentsMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.admin.v1.ExportDocumentsRequest,
-                      com.google.longrunning.Operation>(this, METHODID_EXPORT_DOCUMENTS)))
-          .addMethod(
-              getImportDocumentsMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.admin.v1.ImportDocumentsRequest,
-                      com.google.longrunning.Operation>(this, METHODID_IMPORT_DOCUMENTS)))
-          .addMethod(
-              getGetDatabaseMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.admin.v1.GetDatabaseRequest,
-                      com.google.firestore.admin.v1.Database>(this, METHODID_GET_DATABASE)))
-          .addMethod(
-              getListDatabasesMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.admin.v1.ListDatabasesRequest,
-                      com.google.firestore.admin.v1.ListDatabasesResponse>(
-                      this, METHODID_LIST_DATABASES)))
-          .addMethod(
-              getUpdateDatabaseMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.admin.v1.UpdateDatabaseRequest,
-                      com.google.longrunning.Operation>(this, METHODID_UPDATE_DATABASE)))
-          .build();
+      return FirestoreAdminGrpc.bindService(this);
     }
   }
 
   /**
-   *
+   * A stub to allow clients to do asynchronous rpc calls to service FirestoreAdmin.
    *
    * <pre>
    * The Cloud Firestore Admin API.
@@ -1181,7 +1135,7 @@ public void updateDatabase(
   }
 
   /**
-   *
+   * A stub to allow clients to do synchronous rpc calls to service FirestoreAdmin.
    *
    * <pre>
    * The Cloud Firestore Admin API.
@@ -1405,7 +1359,7 @@ public com.google.longrunning.Operation updateDatabase(
   }
 
   /**
-   *
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service FirestoreAdmin.
    *
    * <pre>
    * The Cloud Firestore Admin API.
@@ -1650,10 +1604,10 @@ private static final class MethodHandlers<Req, Resp>
           io.grpc.stub.ServerCalls.ServerStreamingMethod<Req, Resp>,
           io.grpc.stub.ServerCalls.ClientStreamingMethod<Req, Resp>,
           io.grpc.stub.ServerCalls.BidiStreamingMethod<Req, Resp> {
-    private final FirestoreAdminImplBase serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(FirestoreAdminImplBase serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -1742,6 +1696,86 @@ public io.grpc.stub.StreamObserver<Req> invoke(
     }
   }
 
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
+    return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+        .addMethod(
+            getCreateIndexMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.admin.v1.CreateIndexRequest,
+                    com.google.longrunning.Operation>(service, METHODID_CREATE_INDEX)))
+        .addMethod(
+            getListIndexesMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.admin.v1.ListIndexesRequest,
+                    com.google.firestore.admin.v1.ListIndexesResponse>(
+                    service, METHODID_LIST_INDEXES)))
+        .addMethod(
+            getGetIndexMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.admin.v1.GetIndexRequest,
+                    com.google.firestore.admin.v1.Index>(service, METHODID_GET_INDEX)))
+        .addMethod(
+            getDeleteIndexMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.admin.v1.DeleteIndexRequest, com.google.protobuf.Empty>(
+                    service, METHODID_DELETE_INDEX)))
+        .addMethod(
+            getGetFieldMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.admin.v1.GetFieldRequest,
+                    com.google.firestore.admin.v1.Field>(service, METHODID_GET_FIELD)))
+        .addMethod(
+            getUpdateFieldMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.admin.v1.UpdateFieldRequest,
+                    com.google.longrunning.Operation>(service, METHODID_UPDATE_FIELD)))
+        .addMethod(
+            getListFieldsMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.admin.v1.ListFieldsRequest,
+                    com.google.firestore.admin.v1.ListFieldsResponse>(
+                    service, METHODID_LIST_FIELDS)))
+        .addMethod(
+            getExportDocumentsMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.admin.v1.ExportDocumentsRequest,
+                    com.google.longrunning.Operation>(service, METHODID_EXPORT_DOCUMENTS)))
+        .addMethod(
+            getImportDocumentsMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.admin.v1.ImportDocumentsRequest,
+                    com.google.longrunning.Operation>(service, METHODID_IMPORT_DOCUMENTS)))
+        .addMethod(
+            getGetDatabaseMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.admin.v1.GetDatabaseRequest,
+                    com.google.firestore.admin.v1.Database>(service, METHODID_GET_DATABASE)))
+        .addMethod(
+            getListDatabasesMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.admin.v1.ListDatabasesRequest,
+                    com.google.firestore.admin.v1.ListDatabasesResponse>(
+                    service, METHODID_LIST_DATABASES)))
+        .addMethod(
+            getUpdateDatabaseMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.admin.v1.UpdateDatabaseRequest,
+                    com.google.longrunning.Operation>(service, METHODID_UPDATE_DATABASE)))
+        .build();
+  }
+
   private abstract static class FirestoreAdminBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoFileDescriptorSupplier,
           io.grpc.protobuf.ProtoServiceDescriptorSupplier {
diff --git a/grpc-google-cloud-firestore-v1/pom.xml b/grpc-google-cloud-firestore-v1/pom.xml
index 943fb817d8..ded52c725d 100644
--- a/grpc-google-cloud-firestore-v1/pom.xml
+++ b/grpc-google-cloud-firestore-v1/pom.xml
@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>grpc-google-cloud-firestore-v1</artifactId>
-    <version>3.9.2</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+    <version>3.9.3</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
     <name>grpc-google-cloud-firestore-v1</name>
     <description>GRPC library for grpc-google-cloud-firestore-v1</description>
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-parent</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/grpc-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/FirestoreGrpc.java b/grpc-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/FirestoreGrpc.java
index c78651db52..62172b7ea2 100644
--- a/grpc-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/FirestoreGrpc.java
+++ b/grpc-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/FirestoreGrpc.java
@@ -776,7 +776,7 @@ public FirestoreFutureStub newStub(
    * truly serverless apps.
    * </pre>
    */
-  public abstract static class FirestoreImplBase implements io.grpc.BindableService {
+  public interface AsyncService {
 
     /**
      *
@@ -785,7 +785,7 @@ public abstract static class FirestoreImplBase implements io.grpc.BindableServic
      * Gets a single document.
      * </pre>
      */
-    public void getDocument(
+    default void getDocument(
         com.google.firestore.v1.GetDocumentRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.v1.Document> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
@@ -799,7 +799,7 @@ public void getDocument(
      * Lists documents.
      * </pre>
      */
-    public void listDocuments(
+    default void listDocuments(
         com.google.firestore.v1.ListDocumentsRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.v1.ListDocumentsResponse>
             responseObserver) {
@@ -814,7 +814,7 @@ public void listDocuments(
      * Updates or inserts a document.
      * </pre>
      */
-    public void updateDocument(
+    default void updateDocument(
         com.google.firestore.v1.UpdateDocumentRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.v1.Document> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
@@ -828,7 +828,7 @@ public void updateDocument(
      * Deletes a document.
      * </pre>
      */
-    public void deleteDocument(
+    default void deleteDocument(
         com.google.firestore.v1.DeleteDocumentRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
@@ -844,7 +844,7 @@ public void deleteDocument(
      * same order that they were requested.
      * </pre>
      */
-    public void batchGetDocuments(
+    default void batchGetDocuments(
         com.google.firestore.v1.BatchGetDocumentsRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.v1.BatchGetDocumentsResponse>
             responseObserver) {
@@ -859,7 +859,7 @@ public void batchGetDocuments(
      * Starts a new transaction.
      * </pre>
      */
-    public void beginTransaction(
+    default void beginTransaction(
         com.google.firestore.v1.BeginTransactionRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.v1.BeginTransactionResponse>
             responseObserver) {
@@ -874,7 +874,7 @@ public void beginTransaction(
      * Commits a transaction, while optionally updating documents.
      * </pre>
      */
-    public void commit(
+    default void commit(
         com.google.firestore.v1.CommitRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.v1.CommitResponse> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCommitMethod(), responseObserver);
@@ -887,7 +887,7 @@ public void commit(
      * Rolls back a transaction.
      * </pre>
      */
-    public void rollback(
+    default void rollback(
         com.google.firestore.v1.RollbackRequest request,
         io.grpc.stub.StreamObserver<com.google.protobuf.Empty> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getRollbackMethod(), responseObserver);
@@ -900,7 +900,7 @@ public void rollback(
      * Runs a query.
      * </pre>
      */
-    public void runQuery(
+    default void runQuery(
         com.google.firestore.v1.RunQueryRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.v1.RunQueryResponse> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getRunQueryMethod(), responseObserver);
@@ -922,7 +922,7 @@ public void runQuery(
      * ```
      * </pre>
      */
-    public void runAggregationQuery(
+    default void runAggregationQuery(
         com.google.firestore.v1.RunAggregationQueryRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.v1.RunAggregationQueryResponse>
             responseObserver) {
@@ -939,7 +939,7 @@ public void runAggregationQuery(
      * can be used by RunQuery as starting/end points for the query results.
      * </pre>
      */
-    public void partitionQuery(
+    default void partitionQuery(
         com.google.firestore.v1.PartitionQueryRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.v1.PartitionQueryResponse>
             responseObserver) {
@@ -955,7 +955,7 @@ public void partitionQuery(
      * only available via the gRPC API (not REST).
      * </pre>
      */
-    public io.grpc.stub.StreamObserver<com.google.firestore.v1.WriteRequest> write(
+    default io.grpc.stub.StreamObserver<com.google.firestore.v1.WriteRequest> write(
         io.grpc.stub.StreamObserver<com.google.firestore.v1.WriteResponse> responseObserver) {
       return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(
           getWriteMethod(), responseObserver);
@@ -969,7 +969,7 @@ public io.grpc.stub.StreamObserver<com.google.firestore.v1.WriteRequest> write(
      * REST).
      * </pre>
      */
-    public io.grpc.stub.StreamObserver<com.google.firestore.v1.ListenRequest> listen(
+    default io.grpc.stub.StreamObserver<com.google.firestore.v1.ListenRequest> listen(
         io.grpc.stub.StreamObserver<com.google.firestore.v1.ListenResponse> responseObserver) {
       return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(
           getListenMethod(), responseObserver);
@@ -982,7 +982,7 @@ public io.grpc.stub.StreamObserver<com.google.firestore.v1.ListenRequest> listen
      * Lists all the collection IDs underneath a document.
      * </pre>
      */
-    public void listCollectionIds(
+    default void listCollectionIds(
         com.google.firestore.v1.ListCollectionIdsRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.v1.ListCollectionIdsResponse>
             responseObserver) {
@@ -1004,7 +1004,7 @@ public void listCollectionIds(
      * [Commit][google.firestore.v1.Firestore.Commit] instead.
      * </pre>
      */
-    public void batchWrite(
+    default void batchWrite(
         com.google.firestore.v1.BatchWriteRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.v1.BatchWriteResponse> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getBatchWriteMethod(), responseObserver);
@@ -1017,124 +1017,37 @@ public void batchWrite(
      * Creates a new document.
      * </pre>
      */
-    public void createDocument(
+    default void createDocument(
         com.google.firestore.v1.CreateDocumentRequest request,
         io.grpc.stub.StreamObserver<com.google.firestore.v1.Document> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
           getCreateDocumentMethod(), responseObserver);
     }
+  }
+
+  /**
+   * Base class for the server implementation of the service Firestore.
+   *
+   * <pre>
+   * The Cloud Firestore service.
+   * Cloud Firestore is a fast, fully managed, serverless, cloud-native NoSQL
+   * document database that simplifies storing, syncing, and querying data for
+   * your mobile, web, and IoT apps at global scale. Its client libraries provide
+   * live synchronization and offline support, while its security features and
+   * integrations with Firebase and Google Cloud Platform accelerate building
+   * truly serverless apps.
+   * </pre>
+   */
+  public abstract static class FirestoreImplBase implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override
     public final io.grpc.ServerServiceDefinition bindService() {
-      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
-          .addMethod(
-              getGetDocumentMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.GetDocumentRequest, com.google.firestore.v1.Document>(
-                      this, METHODID_GET_DOCUMENT)))
-          .addMethod(
-              getListDocumentsMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.ListDocumentsRequest,
-                      com.google.firestore.v1.ListDocumentsResponse>(
-                      this, METHODID_LIST_DOCUMENTS)))
-          .addMethod(
-              getUpdateDocumentMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.UpdateDocumentRequest,
-                      com.google.firestore.v1.Document>(this, METHODID_UPDATE_DOCUMENT)))
-          .addMethod(
-              getDeleteDocumentMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.DeleteDocumentRequest, com.google.protobuf.Empty>(
-                      this, METHODID_DELETE_DOCUMENT)))
-          .addMethod(
-              getBatchGetDocumentsMethod(),
-              io.grpc.stub.ServerCalls.asyncServerStreamingCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.BatchGetDocumentsRequest,
-                      com.google.firestore.v1.BatchGetDocumentsResponse>(
-                      this, METHODID_BATCH_GET_DOCUMENTS)))
-          .addMethod(
-              getBeginTransactionMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.BeginTransactionRequest,
-                      com.google.firestore.v1.BeginTransactionResponse>(
-                      this, METHODID_BEGIN_TRANSACTION)))
-          .addMethod(
-              getCommitMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.CommitRequest,
-                      com.google.firestore.v1.CommitResponse>(this, METHODID_COMMIT)))
-          .addMethod(
-              getRollbackMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.RollbackRequest, com.google.protobuf.Empty>(
-                      this, METHODID_ROLLBACK)))
-          .addMethod(
-              getRunQueryMethod(),
-              io.grpc.stub.ServerCalls.asyncServerStreamingCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.RunQueryRequest,
-                      com.google.firestore.v1.RunQueryResponse>(this, METHODID_RUN_QUERY)))
-          .addMethod(
-              getRunAggregationQueryMethod(),
-              io.grpc.stub.ServerCalls.asyncServerStreamingCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.RunAggregationQueryRequest,
-                      com.google.firestore.v1.RunAggregationQueryResponse>(
-                      this, METHODID_RUN_AGGREGATION_QUERY)))
-          .addMethod(
-              getPartitionQueryMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.PartitionQueryRequest,
-                      com.google.firestore.v1.PartitionQueryResponse>(
-                      this, METHODID_PARTITION_QUERY)))
-          .addMethod(
-              getWriteMethod(),
-              io.grpc.stub.ServerCalls.asyncBidiStreamingCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.WriteRequest, com.google.firestore.v1.WriteResponse>(
-                      this, METHODID_WRITE)))
-          .addMethod(
-              getListenMethod(),
-              io.grpc.stub.ServerCalls.asyncBidiStreamingCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.ListenRequest,
-                      com.google.firestore.v1.ListenResponse>(this, METHODID_LISTEN)))
-          .addMethod(
-              getListCollectionIdsMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.ListCollectionIdsRequest,
-                      com.google.firestore.v1.ListCollectionIdsResponse>(
-                      this, METHODID_LIST_COLLECTION_IDS)))
-          .addMethod(
-              getBatchWriteMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.BatchWriteRequest,
-                      com.google.firestore.v1.BatchWriteResponse>(this, METHODID_BATCH_WRITE)))
-          .addMethod(
-              getCreateDocumentMethod(),
-              io.grpc.stub.ServerCalls.asyncUnaryCall(
-                  new MethodHandlers<
-                      com.google.firestore.v1.CreateDocumentRequest,
-                      com.google.firestore.v1.Document>(this, METHODID_CREATE_DOCUMENT)))
-          .build();
+      return FirestoreGrpc.bindService(this);
     }
   }
 
   /**
-   *
+   * A stub to allow clients to do asynchronous rpc calls to service Firestore.
    *
    * <pre>
    * The Cloud Firestore service.
@@ -1428,7 +1341,7 @@ public void createDocument(
   }
 
   /**
-   *
+   * A stub to allow clients to do synchronous rpc calls to service Firestore.
    *
    * <pre>
    * The Cloud Firestore service.
@@ -1655,7 +1568,7 @@ public com.google.firestore.v1.Document createDocument(
   }
 
   /**
-   *
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service Firestore.
    *
    * <pre>
    * The Cloud Firestore service.
@@ -1859,10 +1772,10 @@ private static final class MethodHandlers<Req, Resp>
           io.grpc.stub.ServerCalls.ServerStreamingMethod<Req, Resp>,
           io.grpc.stub.ServerCalls.ClientStreamingMethod<Req, Resp>,
           io.grpc.stub.ServerCalls.BidiStreamingMethod<Req, Resp> {
-    private final FirestoreImplBase serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(FirestoreImplBase serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -1976,6 +1889,113 @@ public io.grpc.stub.StreamObserver<Req> invoke(
     }
   }
 
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
+    return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+        .addMethod(
+            getGetDocumentMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.GetDocumentRequest, com.google.firestore.v1.Document>(
+                    service, METHODID_GET_DOCUMENT)))
+        .addMethod(
+            getListDocumentsMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.ListDocumentsRequest,
+                    com.google.firestore.v1.ListDocumentsResponse>(
+                    service, METHODID_LIST_DOCUMENTS)))
+        .addMethod(
+            getUpdateDocumentMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.UpdateDocumentRequest,
+                    com.google.firestore.v1.Document>(service, METHODID_UPDATE_DOCUMENT)))
+        .addMethod(
+            getDeleteDocumentMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.DeleteDocumentRequest, com.google.protobuf.Empty>(
+                    service, METHODID_DELETE_DOCUMENT)))
+        .addMethod(
+            getBatchGetDocumentsMethod(),
+            io.grpc.stub.ServerCalls.asyncServerStreamingCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.BatchGetDocumentsRequest,
+                    com.google.firestore.v1.BatchGetDocumentsResponse>(
+                    service, METHODID_BATCH_GET_DOCUMENTS)))
+        .addMethod(
+            getBeginTransactionMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.BeginTransactionRequest,
+                    com.google.firestore.v1.BeginTransactionResponse>(
+                    service, METHODID_BEGIN_TRANSACTION)))
+        .addMethod(
+            getCommitMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.CommitRequest, com.google.firestore.v1.CommitResponse>(
+                    service, METHODID_COMMIT)))
+        .addMethod(
+            getRollbackMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.RollbackRequest, com.google.protobuf.Empty>(
+                    service, METHODID_ROLLBACK)))
+        .addMethod(
+            getRunQueryMethod(),
+            io.grpc.stub.ServerCalls.asyncServerStreamingCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.RunQueryRequest,
+                    com.google.firestore.v1.RunQueryResponse>(service, METHODID_RUN_QUERY)))
+        .addMethod(
+            getRunAggregationQueryMethod(),
+            io.grpc.stub.ServerCalls.asyncServerStreamingCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.RunAggregationQueryRequest,
+                    com.google.firestore.v1.RunAggregationQueryResponse>(
+                    service, METHODID_RUN_AGGREGATION_QUERY)))
+        .addMethod(
+            getPartitionQueryMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.PartitionQueryRequest,
+                    com.google.firestore.v1.PartitionQueryResponse>(
+                    service, METHODID_PARTITION_QUERY)))
+        .addMethod(
+            getWriteMethod(),
+            io.grpc.stub.ServerCalls.asyncBidiStreamingCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.WriteRequest, com.google.firestore.v1.WriteResponse>(
+                    service, METHODID_WRITE)))
+        .addMethod(
+            getListenMethod(),
+            io.grpc.stub.ServerCalls.asyncBidiStreamingCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.ListenRequest, com.google.firestore.v1.ListenResponse>(
+                    service, METHODID_LISTEN)))
+        .addMethod(
+            getListCollectionIdsMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.ListCollectionIdsRequest,
+                    com.google.firestore.v1.ListCollectionIdsResponse>(
+                    service, METHODID_LIST_COLLECTION_IDS)))
+        .addMethod(
+            getBatchWriteMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.BatchWriteRequest,
+                    com.google.firestore.v1.BatchWriteResponse>(service, METHODID_BATCH_WRITE)))
+        .addMethod(
+            getCreateDocumentMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.firestore.v1.CreateDocumentRequest,
+                    com.google.firestore.v1.Document>(service, METHODID_CREATE_DOCUMENT)))
+        .build();
+  }
+
   private abstract static class FirestoreBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoFileDescriptorSupplier,
           io.grpc.protobuf.ProtoServiceDescriptorSupplier {
diff --git a/pom.xml b/pom.xml
index eafa9602a6..813e77f6f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-firestore-parent</artifactId>
   <packaging>pom</packaging>
-  <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
+  <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
   <name>Google Cloud Firestore Parent</name>
   <url>https://github.com/googleapis/java-firestore</url>
   <description>
@@ -150,38 +150,38 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>3.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-firestore-v1</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>3.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>3.9.3</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-firestore-v1</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>3.9.3</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
       </dependency>
 
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>3.5.0</version>
+        <version>3.6.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/proto-google-cloud-firestore-admin-v1/pom.xml b/proto-google-cloud-firestore-admin-v1/pom.xml
index 7b7e50ff64..8ec7ae5003 100644
--- a/proto-google-cloud-firestore-admin-v1/pom.xml
+++ b/proto-google-cloud-firestore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
-    <version>3.9.2</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+    <version>3.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
     <name>proto-google-cloud-firestore-admin-v1</name>
     <description>PROTO library for proto-google-cloud-firestore-admin-v1</description>
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-parent</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/proto-google-cloud-firestore-bundle-v1/pom.xml b/proto-google-cloud-firestore-bundle-v1/pom.xml
index e7be58adb6..a501a5ecca 100644
--- a/proto-google-cloud-firestore-bundle-v1/pom.xml
+++ b/proto-google-cloud-firestore-bundle-v1/pom.xml
@@ -5,14 +5,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
-    <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
 
     <name>proto-google-cloud-firestore-bundle-v1</name>
     <description>PROTO library for proto-google-cloud-firestore-bundle-v1</description>
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-parent</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/proto-google-cloud-firestore-v1/pom.xml b/proto-google-cloud-firestore-v1/pom.xml
index 466c678be4..734a14aac3 100644
--- a/proto-google-cloud-firestore-v1/pom.xml
+++ b/proto-google-cloud-firestore-v1/pom.xml
@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>proto-google-cloud-firestore-v1</artifactId>
-    <version>3.9.2</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+    <version>3.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
     <name>proto-google-cloud-firestore-v1</name>
     <description>PROTO library for proto-google-cloud-firestore-v1</description>
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-parent</artifactId>
-        <version>3.9.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 80f3374207..96370b4d0f 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-firestore</artifactId>
-      <version>3.9.1</version>
+      <version>3.9.2</version>
     </dependency>
     <!-- [END firestore_install_without_bom] -->
 
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index e06b5cb9ec..fcbec268d0 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -32,7 +32,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>26.10.0</version>
+        <version>26.11.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/samples/pom.xml b/samples/pom.xml
index df9eb5deb4..92ca82ebec 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -39,7 +39,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <configuration>
           <skip>true</skip>
         </configuration>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d10b48d90a..f7263c9e65 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-firestore</artifactId>
-      <version>3.9.1</version>
+      <version>3.9.2</version>
     </dependency>
 
     <dependency>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index fc64bd9bf0..f92ed13399 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>26.10.0</version>
+        <version>26.11.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/versions.txt b/versions.txt
index f61c50b1fd..8ff2963dda 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,11 +1,11 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-firestore:3.9.2:3.9.2
-google-cloud-firestore-admin:3.9.2:3.9.2
-google-cloud-firestore-bom:3.9.2:3.9.2
-grpc-google-cloud-firestore-admin-v1:3.9.2:3.9.2
-grpc-google-cloud-firestore-v1:3.9.2:3.9.2
-proto-google-cloud-firestore-admin-v1:3.9.2:3.9.2
-proto-google-cloud-firestore-v1:3.9.2:3.9.2
-proto-google-cloud-firestore-bundle-v1:3.9.2:3.9.2
+google-cloud-firestore:3.9.3:3.9.3
+google-cloud-firestore-admin:3.9.3:3.9.3
+google-cloud-firestore-bom:3.9.3:3.9.3
+grpc-google-cloud-firestore-admin-v1:3.9.3:3.9.3
+grpc-google-cloud-firestore-v1:3.9.3:3.9.3
+proto-google-cloud-firestore-admin-v1:3.9.3:3.9.3
+proto-google-cloud-firestore-v1:3.9.3:3.9.3
+proto-google-cloud-firestore-bundle-v1:3.9.3:3.9.3