diff --git a/google/cloud/datacatalog/v1/BUILD.bazel b/google/cloud/datacatalog/v1/BUILD.bazel
index 8b398650..65f2ad92 100644
--- a/google/cloud/datacatalog/v1/BUILD.bazel
+++ b/google/cloud/datacatalog/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,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "datacatalog_java_gapic",
-    src = ":datacatalog_proto_with_info",
-    gapic_yaml = "datacatalog_gapic.yaml",
+    srcs = [":datacatalog_proto_with_info"],
     grpc_service_config = "datacatalog_grpc_service_config.json",
     package = "google.cloud.datacatalog.v1",
-    service_yaml = "datacatalog_v1.yaml",
     test_deps = [
         ":datacatalog_java_grpc",
         "//google/iam/v1:iam_java_grpc",
diff --git a/google/cloud/datacatalog/v1/datacatalog_gapic.yaml b/google/cloud/datacatalog/v1/datacatalog_gapic.yaml
index af0e3381..49d77e8e 100644
--- a/google/cloud/datacatalog/v1/datacatalog_gapic.yaml
+++ b/google/cloud/datacatalog/v1/datacatalog_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.datacatalog.v1
   python:
     package_name: google.cloud.datacatalog_v1.gapic
   go:
diff --git a/google/cloud/datacatalog/v1beta1/BUILD.bazel b/google/cloud/datacatalog/v1beta1/BUILD.bazel
index c3507dbd..12831198 100644
--- a/google/cloud/datacatalog/v1beta1/BUILD.bazel
+++ b/google/cloud/datacatalog/v1beta1/BUILD.bazel
@@ -46,12 +46,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",
 )
@@ -69,11 +70,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "datacatalog_java_gapic",
-    src = ":datacatalog_proto_with_info",
-    gapic_yaml = "datacatalog_gapic.yaml",
+    srcs = [":datacatalog_proto_with_info"],
     grpc_service_config = "datacatalog_grpc_service_config.json",
     package = "google.cloud.datacatalog.v1beta1",
-    service_yaml = "datacatalog_v1beta1.yaml",
     test_deps = [
         ":datacatalog_java_grpc",
         "//google/iam/v1:iam_java_grpc",
diff --git a/google/cloud/datacatalog/v1beta1/datacatalog_gapic.yaml b/google/cloud/datacatalog/v1beta1/datacatalog_gapic.yaml
index b0cc8bca..0e18869a 100644
--- a/google/cloud/datacatalog/v1beta1/datacatalog_gapic.yaml
+++ b/google/cloud/datacatalog/v1beta1/datacatalog_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.datacatalog.v1beta1
   python:
     package_name: google.cloud.datacatalog_v1beta1.gapic
   go:
@@ -52,7 +50,8 @@ interfaces:
       - print: ["Result type: %s", $resp.search_result_type]
       - print: ["Result subtype: %s", $resp.search_result_subtype]
       - print: ["Relative resource name: %s", $resp.relative_resource_name]
-      - print: ["Linked resource: %s\n", $resp.linked_resource]
+      - print: ["Linked resource: %s
+", $resp.linked_resource]
   - name: GetEntry
     samples:
       standalone: