diff --git a/Vcn/framework-b/Android.bp b/Vcn/framework-b/Android.bp
index 7103c7ce26..f77636875c 100644
--- a/Vcn/framework-b/Android.bp
+++ b/Vcn/framework-b/Android.bp
@@ -173,7 +173,11 @@ java_sdk_library {
     impl_library_visibility: [
         // Using for test only
         "//cts/tests/netlegacy22.api",
+
+        // TODO: b/374174952 Clean up VCN paths when the code location is finalized
         "//cts/tests/tests/vcn",
+        "//packages/modules/Connectivity/Vcn/tests:__subpackages__",
+
         "//external/sl4a:__subpackages__",
         "//frameworks/base/core/tests/bandwidthtests",
         "//frameworks/base/core/tests/benchmarks",
diff --git a/Vcn/tests/unit/Android.bp b/Vcn/tests/unit/Android.bp
index 205fdb119a..a513ad9199 100644
--- a/Vcn/tests/unit/Android.bp
+++ b/Vcn/tests/unit/Android.bp
@@ -6,10 +6,10 @@ package {
     default_team: "trendy_team_enigma",
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "frameworks_base_license"
+    // all of the 'license_kinds' from "Android-Apache-2.0"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_base_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 android_test {