diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index d236978..42271d9 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -428,6 +428,8 @@
 WIFI_FEATURE_IMU_DETECTION := true
 WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true
+# Add WIFI_FEATURE_IMU_DETECTION to soong_config
+$(call soong_config_set,wifi,feature_imu_detection,$(WIFI_FEATURE_IMU_DETECTION))
 
 # Audio
 BOARD_USES_ALSA_AUDIO := true
diff --git a/device-common.mk b/device-common.mk
index e3b204a..bb6cacb 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -1021,6 +1021,9 @@
 # Project
 include hardware/google/pixel/common/pixel-common-device.mk
 
+# gs-common
+include device/google/gs-common/misc_writer/misc_writer.mk
+
 # Citadel
 include hardware/google/pixel/citadel/citadel.mk
 
@@ -1031,7 +1034,7 @@
 -include hardware/google/pixel/pixelstats/device.mk
 
 # thermal
--include hardware/google/pixel/thermal/device.mk
+include device/google/gs-common/thermal/thermal_hal/device.mk
 
 # power HAL
 -include hardware/google/pixel/power-libperfmgr/aidl/device.mk
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index d98ef31..5860544 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -42,31 +42,6 @@
         </interface>
     </hal>
     <hal format="hidl" optional="false">
-        <name>android.hardware.media.c2</name>
-        <version>1.0</version>
-        <interface>
-            <name>IComponentStore</name>
-            <instance>default</instance>
-            <instance>software</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
-        <name>android.hardware.radio</name>
-        <version>1.2</version>
-        <interface>
-            <name>ISap</name>
-            <instance>slot2</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
-        <name>android.hardware.radio.config</name>
-        <version>1.1</version>
-        <interface>
-            <name>IRadioConfig</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
         <name>vendor.display.color</name>
         <version>1.0-5</version>
         <interface>
@@ -247,7 +222,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.wifi_ext</name>
-        <version>1</version>
+        <version>2-3</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>
diff --git a/init.hardware.rc b/init.hardware.rc
index db681cb..669c8dd 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -661,6 +661,7 @@
     mkdir /data/vendor/wifidump 771 root system
     mkdir /data/vendor/ramdump 771 root system
     mkdir /data/vendor/ssrdump 771 root system
+    mkdir /data/vendor/ssrdump/coredump 771 root system
     mkdir /data/vendor/ssrlog  775 root system
     start vendor.ss_ramdump