diff --git a/Android.bp b/Android.bp
index bcfb03e..33d2ea8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -178,7 +178,49 @@
 java_host_for_device {
     name: "Robolectric_all-target",
     libs: ["Robolectric_all"],
-    visibility: ["//visibility:public"],
+    visibility: [
+      ":__subpackages__",
+      //java references
+      "//frameworks/opt/net/wifi/libs/WifiTrackerLib/tests:__pkg__",
+      "//prebuilts/sdk/current/androidx:__pkg__",
+      "//prebuilts/sdk/current/aaos-libs:__pkg__",
+      "//packages/apps/TV/tests/common:__pkg__",
+      //robolectric tests
+      "//vendor:__subpackages__",
+      "//platform_testing/robolab/roboStandaloneProj/tests:__pkg__",
+      "//external/mobile-data-download/javatests:__pkg__",
+      "//frameworks/base/services/robotests:__pkg__",
+      "//frameworks/base/services/robotests/backup:__pkg__",
+      "//frameworks/base/packages/SettingsLib/tests/robotests:__pkg__",
+      "//frameworks/base/packages/SystemUI:__pkg__",
+      "//frameworks/opt/car/setupwizard/library/main/tests/robotests:__pkg__",
+      "//frameworks/opt/localepicker/tests:__pkg__",
+      "//frameworks/opt/wear/signaldetector/robotests:__pkg__",
+      "//frameworks/opt/wear/robotests:__pkg__",
+      "//packages/modules/Connectivity/nearby/tests/multidevices/clients/test_support/snippet_helper/tests:__pkg__",
+      "//packages/modules/Connectivity/nearby/tests/robotests:__pkg__",
+      "//packages/modules/DeviceLock/DeviceLockController/tests/robolectric:__pkg__",
+      "//packages/services/Car/tests/CarLibTests:__pkg__",
+      "//packages/services/Mms/tests/robotests:__pkg__",
+      "//packages/apps/QuickAccessWallet/tests/robolectric:__pkg__",
+      "//packages/apps/ManagedProvisioning/tests/robotests:__pkg__",
+      "//packages/apps/Car/libs/car-media-common/tests/robotests",
+      "//packages/apps/Car/libs/car-ui-lib",
+      "//packages/apps/Car/Notification/tests/robotests:__pkg__",
+      "//packages/apps/Car/Cluster/DirectRenderingCluster/tests/robotests:__pkg__",
+      "//packages/apps/Car/Settings/tests/robotests:__pkg__",
+      "//packages/apps/EmergencyInfo/tests/robolectric:__pkg__",
+      "//packages/apps/StorageManager/robotests:__pkg__",
+      "//packages/apps/Settings/tests/robotests:__pkg__",
+      "//packages/apps/ThemePicker/tests/robotests:__pkg__",
+      "//packages/apps/WallpaperPicker2/tests/robotests:__pkg__",
+      "//packages/apps/TvSettings/Settings/tests/robotests:__pkg__",
+      "//packages/apps/KeyChain/robotests:__pkg__",
+      "//packages/apps/CertInstaller/robotests:__pkg__",
+      //tm-dev additions
+      "//frameworks/base/packages/BackupEncryption/test/robolectric-integration:__pkg__",
+      "//frameworks/base/packages/BackupEncryption/test/robolectric:__pkg__",
+    ],
 }
 
 // Make dependencies available as host jars
diff --git a/OWNERS b/OWNERS
index 2011246..8036aa0 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,6 +1,11 @@
 brettchabot@google.com
 hoisie@google.com
 jplemieux@google.com
-leechou@google.com
 yukl@google.com
-tmfang@google.com
\ No newline at end of file
+tmfang@google.com
+chiujason@google.com
+rexhoffman@google.com
+yuwu@google.com
+congxiliu@google.com
+ramperi@google.com
+ihcinihsdk@google.com