diff --git a/google-auth-library-java/credentials/BUILD.bazel b/google-auth-library-java/credentials/BUILD.bazel
new file mode 100644
index 000000000000..04e31f4a1713
--- /dev/null
+++ b/google-auth-library-java/credentials/BUILD.bazel
@@ -0,0 +1,5 @@
+java_library(
+    name = "credentials",
+    srcs = glob(["java/**/*.java"]),
+    visibility = ["//visibility:public"],
+)
diff --git a/google-auth-library-java/oauth2_http/BUILD.bazel b/google-auth-library-java/oauth2_http/BUILD.bazel
new file mode 100644
index 000000000000..3d8cc5b675c5
--- /dev/null
+++ b/google-auth-library-java/oauth2_http/BUILD.bazel
@@ -0,0 +1,20 @@
+java_library(
+    name = "oauth2_http",
+    srcs = glob(["java/**/*.java"]),
+    deps = [
+        "@com_google_guava_guava//jar",
+        "@com_google_guava_failureaccess//jar",
+        "//google-auth-library-java/credentials:credentials",
+        "@com_google_http_client_google_http_client//jar",
+        "@com_google_http_client_google_http_client_gson//jar",
+        "@com_google_api_api_common//jar",
+        "@com_google_code_gson_gson//jar",
+        "@com_google_errorprone_error_prone_annotations//jar",
+        "@com_google_code_findbugs_jsr305//jar",
+        "@com_google_auto_value_auto_value_annotations//jar",
+        "@com_google_auto_value_auto_value//jar",
+        "@org_slf4j_slf4j_api//jar",
+    ],
+    plugins = ["@com_google_api_gax_java//:auto_value_plugin"],
+    visibility = ["//visibility:public"],
+)
diff --git a/google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/InternalAwsSecurityCredentialsSupplier.java b/google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/InternalAwsSecurityCredentialsSupplier.java
index a65c79fabdbf..f8c75bc65b64 100644
--- a/google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/InternalAwsSecurityCredentialsSupplier.java
+++ b/google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/InternalAwsSecurityCredentialsSupplier.java
@@ -235,12 +235,8 @@ Map<String, Object> createMetadataRequestHeaders(AwsCredentialSource awsCredenti
     // Both flows work for IDMS v1 and v2. But if IDMSv2 is enabled, then if
     // session token is not present, Unauthorized exception will be thrown.
     if (awsCredentialSource.imdsv2SessionTokenUrl != null) {
-      Map<String, Object> tokenRequestHeaders =
-          new HashMap<String, Object>() {
-            {
-              put(AWS_IMDSV2_SESSION_TOKEN_TTL_HEADER, AWS_IMDSV2_SESSION_TOKEN_TTL);
-            }
-          };
+      Map<String, Object> tokenRequestHeaders = new HashMap<>();
+      tokenRequestHeaders.put(AWS_IMDSV2_SESSION_TOKEN_TTL_HEADER, AWS_IMDSV2_SESSION_TOKEN_TTL);
 
       String imdsv2SessionToken =
           retrieveResource(
diff --git a/sdk-platform-java/gax-java/gax-grpc/BUILD.bazel b/sdk-platform-java/gax-java/gax-grpc/BUILD.bazel
index be224ff3f8bc..68fc7690a803 100644
--- a/sdk-platform-java/gax-java/gax-grpc/BUILD.bazel
+++ b/sdk-platform-java/gax-java/gax-grpc/BUILD.bazel
@@ -17,8 +17,8 @@ _COMPILE_DEPS = [
     "@com_google_code_findbugs_jsr305//jar",
     "@com_google_code_gson_gson//jar",
     "@org_threeten_threetenbp//jar",
-    "@com_google_auth_google_auth_library_oauth2_http//jar",
-    "@com_google_auth_google_auth_library_credentials//jar",
+    "@gapic_generator_java//google-auth-library-java/oauth2_http",
+    "@gapic_generator_java//google-auth-library-java/credentials",
     "@com_google_api_grpc_proto_google_common_protos//jar",
     "@com_google_api_api_common//jar",
     "@com_google_auto_value_auto_value//jar",
diff --git a/sdk-platform-java/gax-java/gax-httpjson/BUILD.bazel b/sdk-platform-java/gax-java/gax-httpjson/BUILD.bazel
index 1e134e67707d..78b2c01bb256 100644
--- a/sdk-platform-java/gax-java/gax-httpjson/BUILD.bazel
+++ b/sdk-platform-java/gax-java/gax-httpjson/BUILD.bazel
@@ -14,8 +14,8 @@ _COMPILE_DEPS = [
     "@com_google_errorprone_error_prone_annotations//jar",
     "@org_threeten_threetenbp//jar",
     "@com_google_http_client_google_http_client//jar",
-    "@com_google_auth_google_auth_library_oauth2_http//jar",
-    "@com_google_auth_google_auth_library_credentials//jar",
+    "@gapic_generator_java//google-auth-library-java/oauth2_http",
+    "@gapic_generator_java//google-auth-library-java/credentials",
     "@com_google_api_api_common//jar",
     "@com_google_auto_value_auto_value//jar",
     "@com_google_auto_value_auto_value_annotations//jar",
diff --git a/sdk-platform-java/gax-java/gax/BUILD.bazel b/sdk-platform-java/gax-java/gax/BUILD.bazel
index 6f6089132938..7faa2d2597bb 100644
--- a/sdk-platform-java/gax-java/gax/BUILD.bazel
+++ b/sdk-platform-java/gax-java/gax/BUILD.bazel
@@ -11,8 +11,8 @@ _COMPILE_DEPS = [
     "@com_google_api_api_common//jar",
     "@com_google_api_grpc_proto_google_common_protos//jar",
     "@com_google_protobuf_java//jar",
-    "@com_google_auth_google_auth_library_credentials//jar",
-    "@com_google_auth_google_auth_library_oauth2_http//jar",
+    "@gapic_generator_java//google-auth-library-java/credentials",
+    "@gapic_generator_java//google-auth-library-java/oauth2_http",
     "@com_google_auto_value_auto_value//jar",
     "@com_google_auto_value_auto_value_annotations//jar",
     "@com_google_code_findbugs_jsr305//jar",