diff --git a/device.mk b/device.mk
index f4ad6789..eb3fb290 100644
--- a/device.mk
+++ b/device.mk
@@ -545,7 +545,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES_DEBUG += \
 	f2fs_io \
 	check_f2fs \
-	f2fsstat \
 	f2fs.fibmap \
 	dump.f2fs
 
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index a77cc323..229ea214 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -517,18 +517,6 @@ void Dumpstate::dumpDevfreqSection(int fd) {
 
 // Dump items related to memory
 void Dumpstate::dumpMemorySection(int fd) {
-    RunCommandToFd(fd, "ION HEAPS", {"/vendor/bin/sh", "-c",
-                   "for d in $(ls -d /d/ion/*); do "
-                       "if [ -f $d ]; then "
-                           "echo --- $d; cat $d; "
-                       "else "
-                           "for f in $(ls $d); do "
-                               "echo --- $d/$f; cat $d/$f; "
-                               "done; "
-                        "fi; "
-                        "done"});
-    DumpFileToFd(fd, "dmabuf info", "/d/dma_buf/bufinfo");
-    DumpFileToFd(fd, "Page Pinner - longterm pin", "/sys/kernel/debug/page_pinner/buffer");
     RunCommandToFd(fd, "Pixel CMA stat", {"/vendor/bin/sh", "-c",
                    "for d in $(ls -d /sys/kernel/pixel_stat/mm/cma/*); do "
                        "if [ -f $d ]; then "
diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp
index 7d42a76b..b316f355 100644
--- a/usb/usb/Android.bp
+++ b/usb/usb/Android.bp
@@ -42,6 +42,7 @@ cc_binary {
         "libhardware",
         "android.hardware.thermal@1.0",
         "android.hardware.thermal@2.0",
+        "android.hardware.thermal-V1-ndk",
         "android.hardware.usb.gadget@1.0",
         "android.hardware.usb-V2-ndk",
         "libcutils",
@@ -53,6 +54,7 @@ cc_binary {
     static_libs: [
         "libpixelusb",
         "libpixelstats",
+        "libpixelthermalwrapper",
     ],
     export_shared_lib_headers: [
         "android.frameworks.stats-V1-ndk",
diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index f69dca53..74f6868c 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -312,6 +312,12 @@ Status queryNonCompliantChargerStatus(std::vector<PortStatus> *currentPortStatus
                     continue;
                 }
             }
+            if ((*currentPortStatus)[i].complianceWarnings.size() > 0) {
+                (*currentPortStatus)[i].currentMode = PortMode::UFP;
+                (*currentPortStatus)[i].currentPowerRole = PortPowerRole::SINK;
+                (*currentPortStatus)[i].currentDataRole = PortDataRole::NONE;
+                (*currentPortStatus)[i].powerBrickStatus = PowerBrickStatus::CONNECTED;
+            }
         }
     }
     return Status::SUCCESS;