diff --git a/device.mk b/device.mk
index 2afc6f86..4a844887 100644
--- a/device.mk
+++ b/device.mk
@@ -588,7 +588,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
 
 # Titan-M
 ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
-include hardware/google/pixel/dauntless/dauntless.mk
+include device/google/gs-common/dauntless/gsc.mk
 endif
 
 # Copy Camera HFD Setfiles
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 3663ce02..a03ad1c9 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -266,7 +266,7 @@ DumpstateDevice::DumpstateDevice()
         { "aoc", [this](int fd) { dumpAoCSection(fd); } },
         { "ramdump", [this](int fd) { dumpRamdumpSection(fd); } },
         { "misc", [this](int fd) { dumpMiscSection(fd); } },
-        { "gsc", [this](int fd) { dumpGscSection(fd); } },
+        { "dump", [this](int fd) { dumpSection(fd); } },
         { "camera", [this](int fd) { dumpCameraSection(fd); } },
         { "trusty", [this](int fd) { dumpTrustySection(fd); } },
         { "modem", [this](int fd) { dumpModemSection(fd); } },
@@ -1056,11 +1056,9 @@ void DumpstateDevice::dumpMiscSection(int fd) {
     DumpFileToFd(fd, "VENDOR PROC DUMP", "/proc/vendor_sched/dump_task");
 }
 
-// Dump items related to GSC
-void DumpstateDevice::dumpGscSection(int fd) {
-    RunCommandToFd(fd, "Citadel VERSION", {"vendor/bin/hw/citadel_updater", "-lv"});
-    RunCommandToFd(fd, "Citadel STATS", {"vendor/bin/hw/citadel_updater", "--stats"});
-    RunCommandToFd(fd, "GSC DEBUG DUMP", {"vendor/bin/hw/citadel_updater", "-D"});
+// Dump scripts under vendor/bin/dump
+void DumpstateDevice::dumpSection(int fd) {
+    RunCommandToFd(fd, "dump", {"/vendor/bin/dump/dump_gsc.sh"});
 }
 
 // Dump essential camera debugging logs
diff --git a/dumpstate/DumpstateDevice.h b/dumpstate/DumpstateDevice.h
index 5cc32491..bbd523a0 100644
--- a/dumpstate/DumpstateDevice.h
+++ b/dumpstate/DumpstateDevice.h
@@ -76,7 +76,7 @@ struct DumpstateDevice : public IDumpstateDevice {
     void dumpAoCSection(int fd);
     void dumpRamdumpSection(int fd);
     void dumpMiscSection(int fd);
-    void dumpGscSection(int fd);
+    void dumpSection(int fd);
     void dumpCameraSection(int fd);
     void dumpTrustySection(int fd);
     void dumpModemSection(int fd);
diff --git a/health/Health.cpp b/health/Health.cpp
index a50cc8bb..a81e731f 100644
--- a/health/Health.cpp
+++ b/health/Health.cpp
@@ -28,7 +28,6 @@
 #include <health-impl/ChargerUtils.h>
 #include <pixelhealth/BatteryDefender.h>
 #include <pixelhealth/BatteryMetricsLogger.h>
-#include <pixelhealth/BatteryThermalControl.h>
 #include <pixelhealth/ChargerDetect.h>
 #include <pixelhealth/DeviceHealth.h>
 #include <pixelhealth/LowBatteryShutdownMetrics.h>
@@ -55,7 +54,6 @@ using aidl::android::hardware::health::charger::ChargerCallback;
 using aidl::android::hardware::health::charger::ChargerModeMain;
 using hardware::google::pixel::health::BatteryDefender;
 using hardware::google::pixel::health::BatteryMetricsLogger;
-using hardware::google::pixel::health::BatteryThermalControl;
 using hardware::google::pixel::health::DeviceHealth;
 using hardware::google::pixel::health::LowBatteryShutdownMetrics;
 using hardware::google::pixel::health::ChargerDetect;
@@ -70,8 +68,6 @@ constexpr char kVoltageAvg[] {FG_DIR "/voltage_now"};
 static BatteryDefender battDefender(WLC_DIR "/present",
     "/sys/devices/platform/google,charger/charge_start_level",
     "/sys/devices/platform/google,charger/charge_stop_level");
-static BatteryThermalControl battThermalControl(
-    "/dev/thermal/tz-by-name/soc/mode");
 static BatteryMetricsLogger battMetricsLogger(kBatteryResistance, kBatteryOCV);
 static LowBatteryShutdownMetrics shutdownMetrics(kVoltageAvg);
 static DeviceHealth deviceHealth;
@@ -145,7 +141,6 @@ void private_healthd_board_init(struct healthd_config *hc) {
 
 int private_healthd_board_battery_update(HealthInfo *health_info) {
   deviceHealth.update(health_info);
-  battThermalControl.updateThermalState(*health_info);
   battMetricsLogger.logBatteryProperties(*health_info);
   shutdownMetrics.logShutdownVoltage(*health_info);
   // Allow BatteryDefender to override online properties
diff --git a/uwb/uwb.mk b/uwb/uwb.mk
index 7984a091..efd4cf3a 100644
--- a/uwb/uwb.mk
+++ b/uwb/uwb.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # UWB - ultra wide band
-$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk)
+$(call inherit-product-if-exists, vendor/qorvo/uwb/dw3000-hal/uwb.mk)
 
 LOCAL_UWB_CAL_DIR=device/google/gs101/uwb/calibration