diff --git a/Tethering/OWNERS b/Tethering/OWNERS
index 5b42d49041..a6c21fc16b 100644
--- a/Tethering/OWNERS
+++ b/Tethering/OWNERS
@@ -1,2 +1,2 @@
-include platform/packages/modules/NetworkStack/:/OWNERS
-markchien@google.com
+set noparent # while performing migration - b/167962976
+baligh@google.com
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index bf643cdcec..ddb6880753 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -16,7 +16,10 @@
 java_sdk_library {
     name: "framework-tethering",
     defaults: ["framework-module-defaults"],
-    impl_library_visibility: ["//frameworks/base/packages/Tethering:__subpackages__"],
+    impl_library_visibility: [
+        "//frameworks/base/packages/Tethering:__subpackages__",
+        "//packages/modules/Connectivity/Tethering:__subpackages__",
+    ],
 
     srcs: [":framework-tethering-srcs"],
 
diff --git a/Tethering/tests/Android.bp b/Tethering/tests/Android.bp
index cb0a20bdf0..731144cee0 100644
--- a/Tethering/tests/Android.bp
+++ b/Tethering/tests/Android.bp
@@ -19,5 +19,6 @@ filegroup {
     srcs: ["jarjar-rules.txt"],
     visibility: [
         "//frameworks/base/packages/Tethering/tests:__subpackages__",
+        "//packages/modules/Connectivity/Tethering/tests:__subpackages__",
     ]
 }
diff --git a/Tethering/tests/unit/Android.bp b/Tethering/tests/unit/Android.bp
index 3589725dcf..956e2e8325 100644
--- a/Tethering/tests/unit/Android.bp
+++ b/Tethering/tests/unit/Android.bp
@@ -77,6 +77,7 @@ android_library {
     defaults: ["TetheringTestsDefaults"],
     visibility: [
         "//frameworks/base/packages/Tethering/tests/integration",
+        "//packages/modules/Connectivity/Tethering/tests/integration",
     ]
 }