diff --git a/google/spanner/admin/database/v1/BUILD.bazel b/google/spanner/admin/database/v1/BUILD.bazel
index 868b80ee..436845fe 100644
--- a/google/spanner/admin/database/v1/BUILD.bazel
+++ b/google/spanner/admin/database/v1/BUILD.bazel
@@ -40,12 +40,13 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
+# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
+    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
     "java_grpc_library",
     "java_proto_library",
 )
@@ -63,11 +64,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "database_java_gapic",
-    src = ":database_proto_with_info",
+    srcs = [":database_proto_with_info"],
     gapic_yaml = "spanner_admin_database_gapic.yaml",
     grpc_service_config = "spanner_admin_database_grpc_service_config.json",
     package = "google.spanner.admin.database.v1",
-    service_yaml = "spanner_admin_database.yaml",
     test_deps = [
         ":database_java_grpc",
         "//google/iam/v1:iam_java_grpc",
diff --git a/google/spanner/admin/instance/v1/BUILD.bazel b/google/spanner/admin/instance/v1/BUILD.bazel
index 92ff6faf..d98d9eb8 100644
--- a/google/spanner/admin/instance/v1/BUILD.bazel
+++ b/google/spanner/admin/instance/v1/BUILD.bazel
@@ -38,12 +38,13 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
+# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
+    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
     "java_grpc_library",
     "java_proto_library",
 )
@@ -61,11 +62,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "instance_java_gapic",
-    src = ":instance_proto_with_info",
+    srcs = [":instance_proto_with_info"],
     gapic_yaml = "spanner_admin_instance_gapic.yaml",
     grpc_service_config = "spanner_admin_instance_grpc_service_config.json",
     package = "google.spanner.admin.instance.v1",
-    service_yaml = "spanner_admin_instance.yaml",
     test_deps = [
         ":instance_java_grpc",
         "//google/iam/v1:iam_java_grpc",
diff --git a/google/spanner/v1/BUILD.bazel b/google/spanner/v1/BUILD.bazel
index 96cbd412..72e32e5a 100644
--- a/google/spanner/v1/BUILD.bazel
+++ b/google/spanner/v1/BUILD.bazel
@@ -43,12 +43,13 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
+# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
+    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
     "java_grpc_library",
     "java_proto_library",
 )
@@ -66,11 +67,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "spanner_java_gapic",
-    src = ":spanner_proto_with_info",
+    srcs = [":spanner_proto_with_info"],
     gapic_yaml = "spanner_gapic.yaml",
     grpc_service_config = "spanner_grpc_service_config.json",
     package = "google.spanner.v1",
-    service_yaml = "spanner.yaml",
     test_deps = [
         ":spanner_java_grpc",
     ],