diff --git a/Android.bp b/Android.bp
index c361a14..43d3b766 100644
--- a/Android.bp
+++ b/Android.bp
@@ -295,7 +295,6 @@
     visibility: [
         "//bootable/recovery/minadbd:__subpackages__",
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb:__subpackages__",
     ],
 
     apex_available: [
@@ -501,7 +500,6 @@
     visibility: [
         "//bootable/recovery/minadbd",
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb",
     ],
 }
 
@@ -581,7 +579,6 @@
     ],
     visibility: [
         "//packages/modules/adb",
-        "//system/core/adb",
     ],
 
 }
@@ -640,7 +637,6 @@
     visibility: [
         "//bootable/recovery/minadbd",
         "//packages/modules/adb",
-        "//system/core/adb",
     ],
 }
 
diff --git a/apex/Android.bp b/apex/Android.bp
index ddb17da..ef4a50b 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -1,7 +1,7 @@
 apex_defaults {
     name: "com.android.adbd-defaults",
     updatable: true,
-    min_sdk_version: "R",
+    min_sdk_version: "30",
 
     binaries: ["adbd"],
     compile_multilib: "both",
diff --git a/client/commandline.cpp b/client/commandline.cpp
index d9e69f7..01aa9a3 100644
--- a/client/commandline.cpp
+++ b/client/commandline.cpp
@@ -1969,7 +1969,7 @@
         return do_sync_push(srcs, dst, sync, compression, dry_run) ? 0 : 1;
     } else if (!strcmp(argv[0], "pull")) {
         bool copy_attrs = false;
-        CompressionType compression = CompressionType::Any;
+        CompressionType compression = CompressionType::None;
         std::vector<const char*> srcs;
         const char* dst = ".";
 
diff --git a/coverage/report.sh b/coverage/report.sh
index 257310c..335d3a7 100755
--- a/coverage/report.sh
+++ b/coverage/report.sh
@@ -10,13 +10,13 @@
 cd $ANDROID_BUILD_TOP
 llvm-cov show --instr-profile="$OUTPUT_DIR"/adbd.profdata \
   $ANDROID_PRODUCT_OUT/apex/com.android.adbd/bin/adbd \
-  /proc/self/cwd/system/core/adb \
+  /proc/self/cwd/packages/modules/adb \
   $ADB_TEST_BINARIES \
   --show-region-summary=false \
   --format=html -o "$OUTPUT_DIR"/report
 
 llvm-cov report --instr-profile="$OUTPUT_DIR"/adbd.profdata \
   $ANDROID_PRODUCT_OUT/apex/com.android.adbd/bin/adbd \
-  /proc/self/cwd/system/core/adb \
+  /proc/self/cwd/packages/modules/adb \
   $ADB_TEST_BINARIES \
   --show-region-summary=false
diff --git a/coverage/show.sh b/coverage/show.sh
index 3b2faa3..9435e19 100755
--- a/coverage/show.sh
+++ b/coverage/show.sh
@@ -5,7 +5,7 @@
 OUTPUT_DIR=$(realpath $(dirname "$0"))
 . "$OUTPUT_DIR"/include.sh
 
-BASE_PATH=/proc/self/cwd/system/core/adb
+BASE_PATH=/proc/self/cwd/packages/modules/adb
 PATHS=""
 if [[ $# == 0 ]]; then
   PATHS=$BASE_PATH
diff --git a/crypto/Android.bp b/crypto/Android.bp
index c4052c3..1ff76dc 100644
--- a/crypto/Android.bp
+++ b/crypto/Android.bp
@@ -41,7 +41,6 @@
     visibility: [
         "//bootable/recovery/minadbd:__subpackages__",
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb:__subpackages__",
     ],
 
     host_supported: true,
diff --git a/libs/adbconnection/Android.bp b/libs/adbconnection/Android.bp
index 29ae060..0c01217 100644
--- a/libs/adbconnection/Android.bp
+++ b/libs/adbconnection/Android.bp
@@ -40,7 +40,6 @@
     visibility: [
         "//art:__subpackages__",
         "//packages/modules/adb/apex:__subpackages__",
-        "//system/core/adb/apex:__subpackages__",
     ],
     apex_available: [
         "com.android.adbd",
diff --git a/pairing_auth/Android.bp b/pairing_auth/Android.bp
index 806879d..9785ee2 100644
--- a/pairing_auth/Android.bp
+++ b/pairing_auth/Android.bp
@@ -41,7 +41,6 @@
     visibility: [
         "//art:__subpackages__",
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb:__subpackages__",
     ],
 
     // libadb_pairing_auth doesn't need an embedded build number.
diff --git a/pairing_connection/Android.bp b/pairing_connection/Android.bp
index 1886885..0cfb7c0 100644
--- a/pairing_connection/Android.bp
+++ b/pairing_connection/Android.bp
@@ -41,7 +41,6 @@
         "//art:__subpackages__",
         "//frameworks/base/services:__subpackages__",
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb:__subpackages__",
 
         // This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
         "//bootable/recovery/minadbd:__subpackages__",
@@ -132,7 +131,6 @@
         "//art:__subpackages__",
         "//frameworks/base/services:__subpackages__",
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb:__subpackages__",
     ],
 
     recovery_available: false,
diff --git a/proto/Android.bp b/proto/Android.bp
index ef97208..b7eaa48 100644
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -41,7 +41,6 @@
 
     visibility: [
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb:__subpackages__",
 
         // This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
         "//bootable/recovery/minadbd:__subpackages__",
@@ -96,7 +95,6 @@
 
     visibility: [
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb:__subpackages__",
 
         // This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
         "//bootable/recovery/minadbd:__subpackages__",
diff --git a/test_device.py b/test_device.py
index a92d4a7..aa06369 100755
--- a/test_device.py
+++ b/test_device.py
@@ -627,6 +627,7 @@
             os.remove(tf.name)
 
 
+@unittest.skip("b/172372960: temporarily disabled due to flakiness")
 class RootUnrootTest(DeviceTest):
     def _test_root(self):
         message = self.device.root()
diff --git a/tls/Android.bp b/tls/Android.bp
index 1e00548..eee5984 100644
--- a/tls/Android.bp
+++ b/tls/Android.bp
@@ -41,7 +41,6 @@
     visibility: [
         "//bootable/recovery/minadbd:__subpackages__",
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb:__subpackages__",
     ],
 
     shared_libs: [