diff --git a/service-t/Android.bp b/service-t/Android.bp
index 551788ae1f..483d4226dd 100644
--- a/service-t/Android.bp
+++ b/service-t/Android.bp
@@ -78,10 +78,14 @@ java_library {
     ],
     visibility: [
         "//frameworks/base/services/tests/VpnTests",
+
+        // TODO: b/379938062 Remove this after VCN UT is in p/m/C
         "//frameworks/base/tests/vcn",
+
         "//packages/modules/Connectivity/service",
         "//packages/modules/Connectivity/tests:__subpackages__",
         "//packages/modules/IPsec/tests/iketests",
+        "//packages/modules/Connectivity/Vcn/tests/unit",
     ],
     lint: {
         baseline_filename: "lint-baseline.xml",
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 9702715c92..d8a2771980 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -767,6 +767,7 @@ java_library {
     visibility: [
         // TODO: b/374174952 Remove it when VCN modularization is released
         "//frameworks/base/packages/Vcn/service-b",
+        "//packages/modules/Connectivity/Vcn/service-b",
 
         "//packages/modules/Connectivity/service-b",
     ],