diff --git a/google/cloud/vision/v1/BUILD.bazel b/google/cloud/vision/v1/BUILD.bazel
index 218e329e..9716a83c 100644
--- a/google/cloud/vision/v1/BUILD.bazel
+++ b/google/cloud/vision/v1/BUILD.bazel
@@ -44,12 +44,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",
 )
@@ -67,11 +68,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "vision_java_gapic",
-    src = ":vision_proto_with_info",
+    srcs = [":vision_proto_with_info"],
     gapic_yaml = "vision_gapic.yaml",
     grpc_service_config = "vision_grpc_service_config.json",
     package = "google.cloud.vision.v1",
-    service_yaml = "vision_v1.yaml",
     test_deps = [
         ":vision_java_grpc",
     ],
diff --git a/google/cloud/vision/v1/vision_gapic.yaml b/google/cloud/vision/v1/vision_gapic.yaml
index 8051ff13..529f2b1a 100644
--- a/google/cloud/vision/v1/vision_gapic.yaml
+++ b/google/cloud/vision/v1/vision_gapic.yaml
@@ -1,9 +1,6 @@
 type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
 language_settings:
-  java:
-    package_name: com.google.cloud.vision.v1
-    release_level: GA
   python:
     package_name: google.cloud.vision_v1.gapic
   go:
@@ -66,22 +63,23 @@ interfaces:
                   collection: page.blocks
                   variable: block
                   body:
-                  - print: ["\nBlock confidence: %s", block.confidence]
+                  - print: ["
+Block confidence: %s", block.confidence]
                   - loop:
                       collection: block.paragraphs
                       variable: par
                       body:
-                      - print: ["\tParagraph confidence: %s", par.confidence]
+                      - print: ["	Paragraph confidence: %s", par.confidence]
                       - loop:
                           collection: par.words
                           variable: word
                           body:
-                          - print: ["\t\tWord confidence: %s", word.confidence]
+                          - print: ["		Word confidence: %s", word.confidence]
                           - loop:
                               collection: word.symbols
                               variable: symbol
                               body:
-                              - print: ["\t\t\tSymbol: %s, (confidence: %s)", symbol.text, symbol.confidence]
+                              - print: ["			Symbol: %s, (confidence: %s)", symbol.text, symbol.confidence]
     - id: vision_batch_annotate_files
       description: "Perform batch file annotation"
       parameters:
@@ -115,22 +113,23 @@ interfaces:
                   collection: page.blocks
                   variable: block
                   body:
-                  - print: ["\nBlock confidence: %s", block.confidence]
+                  - print: ["
+Block confidence: %s", block.confidence]
                   - loop:
                       collection: block.paragraphs
                       variable: par
                       body:
-                      - print: ["\tParagraph confidence: %s", par.confidence]
+                      - print: ["	Paragraph confidence: %s", par.confidence]
                       - loop:
                           collection: par.words
                           variable: word
                           body:
-                          - print: ["\t\tWord confidence: %s", word.confidence]
+                          - print: ["		Word confidence: %s", word.confidence]
                           - loop:
                               collection: word.symbols
                               variable: symbol
                               body:
-                              - print: ["\t\t\tSymbol: %s, (confidence: %s)", symbol.text, symbol.confidence]
+                              - print: ["			Symbol: %s, (confidence: %s)", symbol.text, symbol.confidence]
   - name: AsyncBatchAnnotateImages
     long_running:
       initial_poll_delay_millis: 20000
diff --git a/google/cloud/vision/v1p1beta1/BUILD.bazel b/google/cloud/vision/v1p1beta1/BUILD.bazel
index df8eba1a..d0bb751a 100644
--- a/google/cloud/vision/v1p1beta1/BUILD.bazel
+++ b/google/cloud/vision/v1p1beta1/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,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "vision_java_gapic",
-    src = ":vision_proto_with_info",
-    gapic_yaml = "vision_gapic.yaml",
+    srcs = [":vision_proto_with_info"],
     grpc_service_config = "vision_grpc_service_config.json",
     package = "google.cloud.vision.v1p1beta1",
-    service_yaml = "//google/cloud/vision:vision_v1p1beta1.yaml",
     test_deps = [
         ":vision_java_grpc",
     ],
diff --git a/google/cloud/vision/v1p1beta1/vision_gapic.yaml b/google/cloud/vision/v1p1beta1/vision_gapic.yaml
index af04f58b..aaea3f3b 100644
--- a/google/cloud/vision/v1p1beta1/vision_gapic.yaml
+++ b/google/cloud/vision/v1p1beta1/vision_gapic.yaml
@@ -1,8 +1,6 @@
 type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
 language_settings:
-  java:
-    package_name: com.google.cloud.vision.v1p1beta1
   python:
     package_name: google.cloud.vision_v1p1beta1.gapic
   go:
diff --git a/google/cloud/vision/v1p2beta1/BUILD.bazel b/google/cloud/vision/v1p2beta1/BUILD.bazel
index 11427662..9d23558e 100644
--- a/google/cloud/vision/v1p2beta1/BUILD.bazel
+++ b/google/cloud/vision/v1p2beta1/BUILD.bazel
@@ -39,12 +39,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",
 )
@@ -62,11 +63,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "vision_java_gapic",
-    src = ":vision_proto_with_info",
+    srcs = [":vision_proto_with_info"],
     gapic_yaml = "vision_gapic.yaml",
     grpc_service_config = "vision_grpc_service_config.json",
     package = "google.cloud.vision.v1p2beta1",
-    service_yaml = "//google/cloud/vision:vision_v1p2beta1.yaml",
     test_deps = [
         ":vision_java_grpc",
     ],
diff --git a/google/cloud/vision/v1p2beta1/vision_gapic.yaml b/google/cloud/vision/v1p2beta1/vision_gapic.yaml
index bafd1772..3827923e 100644
--- a/google/cloud/vision/v1p2beta1/vision_gapic.yaml
+++ b/google/cloud/vision/v1p2beta1/vision_gapic.yaml
@@ -1,8 +1,6 @@
 type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
 language_settings:
-  java:
-    package_name: com.google.cloud.vision.v1p2beta1
   python:
     package_name: google.cloud.vision_v1p2beta1.gapic
   go:
diff --git a/google/cloud/vision/v1p3beta1/BUILD.bazel b/google/cloud/vision/v1p3beta1/BUILD.bazel
index 599f6216..fadfc09e 100644
--- a/google/cloud/vision/v1p3beta1/BUILD.bazel
+++ b/google/cloud/vision/v1p3beta1/BUILD.bazel
@@ -44,12 +44,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",
 )
@@ -67,11 +68,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "vision_java_gapic",
-    src = ":vision_proto_with_info",
+    srcs = [":vision_proto_with_info"],
     gapic_yaml = "vision_gapic.yaml",
     grpc_service_config = "vision_grpc_service_config.json",
     package = "google.cloud.vision.v1p3beta1",
-    service_yaml = "//google/cloud/vision:vision_v1p3beta1.yaml",
     test_deps = [
         ":vision_java_grpc",
     ],
diff --git a/google/cloud/vision/v1p3beta1/vision_gapic.yaml b/google/cloud/vision/v1p3beta1/vision_gapic.yaml
index 9bf33c9d..c29ae3ff 100644
--- a/google/cloud/vision/v1p3beta1/vision_gapic.yaml
+++ b/google/cloud/vision/v1p3beta1/vision_gapic.yaml
@@ -1,8 +1,6 @@
 type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
 language_settings:
-  java:
-    package_name: com.google.cloud.vision.v1p3beta1
   python:
     package_name: google.cloud.vision_v1p3beta1.gapic
   go:
diff --git a/google/cloud/vision/v1p4beta1/BUILD.bazel b/google/cloud/vision/v1p4beta1/BUILD.bazel
index fd3d31f8..b2be2c77 100644
--- a/google/cloud/vision/v1p4beta1/BUILD.bazel
+++ b/google/cloud/vision/v1p4beta1/BUILD.bazel
@@ -45,12 +45,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",
 )
@@ -68,11 +69,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "vision_java_gapic",
-    src = ":vision_proto_with_info",
+    srcs = [":vision_proto_with_info"],
     gapic_yaml = "vision_gapic.yaml",
     grpc_service_config = "vision_grpc_service_config.json",
     package = "google.cloud.vision.v1p4beta1",
-    service_yaml = "//google/cloud/vision:vision_v1p4beta1.yaml",
     test_deps = [
         ":vision_java_grpc",
     ],
diff --git a/google/cloud/vision/v1p4beta1/vision_gapic.yaml b/google/cloud/vision/v1p4beta1/vision_gapic.yaml
index 00f5d0d2..8652842c 100644
--- a/google/cloud/vision/v1p4beta1/vision_gapic.yaml
+++ b/google/cloud/vision/v1p4beta1/vision_gapic.yaml
@@ -2,8 +2,6 @@ type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
 # The settings of generated code in a specific language.
 language_settings:
-  java:
-    package_name: com.google.cloud.vision.v1p4beta1
   python:
     package_name: google.cloud.vision_v1p4beta1.gapic
   go: