diff --git a/google/devtools/build/v1/BUILD.bazel b/google/devtools/build/v1/BUILD.bazel
index 2d571852..0fb0a65d 100644
--- a/google/devtools/build/v1/BUILD.bazel
+++ b/google/devtools/build/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 = "build_java_gapic",
-    src = ":build_proto_with_info",
+    srcs = [":build_proto_with_info"],
     gapic_yaml = "buildeventservice_gapic.yaml",
     grpc_service_config = "buildeventservice_grpc_service_config.json",
     package = "google.devtools.build.v1",
-    service_yaml = "buildeventservice_v1.yaml",
     test_deps = [
         ":build_java_grpc",
     ],
diff --git a/google/devtools/cloudbuild/v1/BUILD.bazel b/google/devtools/cloudbuild/v1/BUILD.bazel
index 01eaf2dc..1b4e673a 100644
--- a/google/devtools/cloudbuild/v1/BUILD.bazel
+++ b/google/devtools/cloudbuild/v1/BUILD.bazel
@@ -37,12 +37,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",
 )
@@ -60,11 +61,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "cloudbuild_java_gapic",
-    src = ":cloudbuild_proto_with_info",
+    srcs = [":cloudbuild_proto_with_info"],
     gapic_yaml = "cloudbuild_gapic.yaml",
     grpc_service_config = "cloudbuild_grpc_service_config.json",
     package = "google.devtools.cloudbuild.v1",
-    service_yaml = "cloudbuild_v1.yaml",
     test_deps = [
         ":cloudbuild_java_grpc",
     ],