diff --git a/device.mk b/device.mk
index b47c807e..a9454af0 100644
--- a/device.mk
+++ b/device.mk
@@ -76,7 +76,7 @@ PRODUCT_SOONG_NAMESPACES += \
 	hardware/google/pixel \
 	device/google/zuma \
 	device/google/zuma/powerstats \
-	system/chre/host/hal_generic \
+	vendor/google_devices/common/chre/host/hal \
 	vendor/google/whitechapel/tools \
 	vendor/google/interfaces \
 	vendor/google_devices/common/proprietary/confirmatioui_hal \
@@ -389,7 +389,8 @@ PRODUCT_PACKAGES += \
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES += \
 	chre_power_test_client \
-	chre_test_client
+	chre_test_client \
+	chre_aidl_hal_client
 endif
 
 ## HAL
@@ -398,10 +399,9 @@ PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.context_hub.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.context_hub.xml
 
 ## Enable the CHRE Daemon
-CHRE_USF_DAEMON_ENABLED := true
+CHRE_USF_DAEMON_ENABLED := false
 CHRE_DEDICATED_TRANSPORT_CHANNEL_ENABLED := true
 PRODUCT_PACKAGES += \
-	chre \
 	preloaded_nanoapps.json
 
 # Filesystem management tools
diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp
index e6ee5799..562dc7cc 100644
--- a/dumpstate/dump_power.cpp
+++ b/dumpstate/dump_power.cpp
@@ -152,6 +152,26 @@ void dumpAcpmStats() {
     readContentsOfDir(acpmTitle, acpmDir, statsSubStr, true, true);
 }
 
+void dumpTcpmPsyUevent() {
+    const char* tcpmPsy = "tcpm-source-psy-";
+    DIR *dir = opendir("/sys/class/power_supply/");
+    struct dirent *entry;
+
+    if (dir == NULL)
+        return;
+
+    while ((entry = readdir(dir)) != NULL) {
+        if (std::string::npos != std::string(entry->d_name).find(tcpmPsy)) {
+            std::string fullPath("/sys/class/power_supply/" + (const std::string)entry->d_name +
+                                 "/uevent");
+            dumpFileContent("Power supply property tcpm", fullPath.c_str());
+            break;
+        }
+    }
+
+    closedir(dir);
+}
+
 void dumpPowerSupplyStats() {
     const char* dumpList[][2] = {
             {"CPU PM stats", "/sys/devices/system/cpu/cpupm/cpupm/time_in_state"},
@@ -162,7 +182,6 @@ void dumpPowerSupplyStats() {
             {"Power supply property gcpm_pps", "/sys/class/power_supply/gcpm_pps/uevent"},
             {"Power supply property main-charger", "/sys/class/power_supply/main-charger/uevent"},
             {"Power supply property dc-mains", "/sys/class/power_supply/dc-mains/uevent"},
-            {"Power supply property tcpm", "/sys/class/power_supply/tcpm-source-psy-11-0025/uevent"},
             {"Power supply property usb", "/sys/class/power_supply/usb/uevent"},
             {"Power supply property wireless", "/sys/class/power_supply/wireless/uevent"},
     };
@@ -170,6 +189,8 @@ void dumpPowerSupplyStats() {
     for (const auto &row : dumpList) {
         dumpFileContent(row[0], row[1]);
     }
+
+    dumpTcpmPsyUevent();
 }
 
 void dumpMaxFg() {