diff --git a/audio/comet/aidl_config/mixer_paths_aidl.xml b/audio/comet/aidl_config/mixer_paths_aidl.xml
index ccfa9c0..6fb772f 100644
--- a/audio/comet/aidl_config/mixer_paths_aidl.xml
+++ b/audio/comet/aidl_config/mixer_paths_aidl.xml
@@ -895,6 +895,18 @@
     <ctl name="BT_RX Mixer EP4" value="1" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-default">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-headset">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-car-kit">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
     <path name="spatializer-offload-playback -> bt" />
   </path>
diff --git a/bluetooth/bluetooth_power_limits_comet.csv b/bluetooth/bluetooth_power_limits_comet.csv
index 5cdbb3c..d516bb6 100644
--- a/bluetooth/bluetooth_power_limits_comet.csv
+++ b/bluetooth/bluetooth_power_limits_comet.csv
@@ -1,71 +1,71 @@
-Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
-off,off,off,off,off,off,on,78,68,78,78,68,78,66,56,66,66,56,66
-off,off,off,off,off,on,on,78,68,78,78,68,78,66,56,66,66,56,66
-off,off,off,off,on,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,off,on,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,on,off,off,on,78,68,78,78,68,78,66,56,66,66,56,66
-off,off,off,on,off,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,on,on,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,on,on,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,off,off,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,off,off,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,off,on,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,off,on,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,on,off,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,on,off,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,on,on,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,on,on,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,on,off,off,off,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,off,off,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,off,on,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,off,on,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,on,off,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,on,off,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,on,on,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,on,on,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,off,off,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,off,off,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,off,on,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,off,on,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,on,off,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,on,off,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,on,on,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,on,on,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,off,off,any,off,any,off,78,68,78,78,68,78,66,56,66,66,56,66
-off,off,on,any,off,any,off,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,any,on,any,off,78,68,78,68,68,68,66,56,66,66,56,66
-on,off,off,off,off,off,on,78,68,78,78,68,78,66,56,66,66,56,66
-on,off,off,off,off,on,on,78,68,78,76,68,76,66,56,66,66,56,66
-on,off,off,off,on,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,off,on,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,on,off,off,on,78,68,78,76,68,76,66,56,66,66,56,66
-on,off,off,on,off,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,on,on,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,on,on,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,off,off,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,off,off,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,off,on,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,off,on,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,on,off,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,on,off,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,on,on,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,on,on,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,on,off,off,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,off,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,off,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,off,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,on,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,on,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,on,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,on,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,off,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,off,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,off,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,off,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,on,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,on,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,on,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,on,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,off,off,any,off,any,off,78,68,78,78,68,78,66,56,66,66,56,66
-on,off,on,any,off,any,off,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,any,on,any,off,78,68,78,62,62,62,62,56,62,62,56,62
+Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1
+off,off,off,off,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+off,off,off,off,off,on,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+off,off,off,off,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,off,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,on,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+off,off,off,on,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,on,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,on,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,off,off,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,off,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,off,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,off,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,on,off,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,on,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,on,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,on,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,on,off,off,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,off,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,off,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,off,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,on,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,on,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,on,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,on,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,off,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,off,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,off,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,off,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,on,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,on,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,on,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,on,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,off,off,any,off,any,off,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+off,off,on,any,off,any,off,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,any,on,any,off,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+on,off,off,off,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+on,off,off,off,off,on,on,78,68,78,68,76,68,76,68,66,56,66,56,66,56,66,56
+on,off,off,off,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,off,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,on,off,off,on,78,68,78,68,76,68,76,68,66,56,66,56,66,56,66,56
+on,off,off,on,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,on,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,on,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,off,off,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,off,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,off,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,off,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,on,off,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,on,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,on,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,on,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,on,off,off,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,off,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,off,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,off,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,on,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,on,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,on,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,on,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,off,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,off,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,off,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,off,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,on,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,on,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,on,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,on,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,off,off,any,off,any,off,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+on,off,on,any,off,any,off,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,any,on,any,off,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
diff --git a/bluetooth/bluetooth_power_limits_comet_CA.csv b/bluetooth/bluetooth_power_limits_comet_CA.csv
index 7b57635..0d5114b 100644
--- a/bluetooth/bluetooth_power_limits_comet_CA.csv
+++ b/bluetooth/bluetooth_power_limits_comet_CA.csv
@@ -1,71 +1,71 @@
-Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
-off,off,off,off,off,off,on,78,68,78,78,68,78,66,56,66,66,56,66
-off,off,off,off,off,on,on,78,68,78,78,68,78,66,56,66,66,56,66
-off,off,off,off,on,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,off,on,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,on,off,off,on,78,68,78,78,68,78,66,56,66,66,56,66
-off,off,off,on,off,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,on,on,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,on,on,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,off,off,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,off,off,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,off,on,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,off,on,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,on,off,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,on,off,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,on,on,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,on,on,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,on,off,off,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,off,off,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,off,off,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,off,off,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,off,on,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,off,on,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,off,on,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,off,on,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,on,off,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,on,off,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,on,off,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,on,off,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,on,on,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,on,on,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,on,on,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,on,on,on,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-off,off,off,any,off,any,off,78,68,78,78,68,78,66,56,66,66,56,66
-off,off,on,any,off,any,off,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,any,on,any,off,78,68,78,68,68,68,66,56,66,66,56,66
-on,off,off,off,off,off,on,78,68,78,78,68,78,66,56,66,66,56,66
-on,off,off,off,off,on,on,78,68,78,76,68,76,66,56,66,66,56,66
-on,off,off,off,on,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,off,on,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,on,off,off,on,78,68,78,76,68,76,66,56,66,66,56,66
-on,off,off,on,off,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,on,on,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,on,on,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,off,off,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,off,off,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,off,on,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,off,on,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,on,off,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,on,off,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,on,on,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,on,on,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,on,off,off,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,off,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,off,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,off,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,on,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,on,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,on,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,on,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,off,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,off,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,off,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,off,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,on,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,on,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,on,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,on,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,off,off,any,off,any,off,78,68,78,78,68,78,66,56,66,66,56,66
-on,off,on,any,off,any,off,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,any,on,any,off,78,68,78,62,62,62,62,56,62,62,56,62
+Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1
+off,off,off,off,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+off,off,off,off,off,on,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+off,off,off,off,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,off,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,on,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+off,off,off,on,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,on,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,on,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,off,off,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,off,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,off,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,off,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,on,off,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,on,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,on,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,on,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,on,off,off,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,off,off,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,off,off,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,off,off,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,off,on,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,off,on,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,off,on,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,off,on,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,on,off,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,on,off,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,on,off,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,on,off,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,on,on,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,on,on,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,on,on,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,on,on,on,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+off,off,off,any,off,any,off,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+off,off,on,any,off,any,off,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,any,on,any,off,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+on,off,off,off,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+on,off,off,off,off,on,on,78,68,78,68,76,68,76,68,66,56,66,56,66,56,66,56
+on,off,off,off,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,off,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,on,off,off,on,78,68,78,68,76,68,76,68,66,56,66,56,66,56,66,56
+on,off,off,on,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,on,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,on,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,off,off,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,off,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,off,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,off,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,on,off,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,on,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,on,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,on,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,on,off,off,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,off,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,off,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,off,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,on,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,on,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,on,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,on,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,off,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,off,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,off,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,off,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,on,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,on,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,on,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,on,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,off,off,any,off,any,off,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+on,off,on,any,off,any,off,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,any,on,any,off,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
diff --git a/bluetooth/bluetooth_power_limits_comet_CE.csv b/bluetooth/bluetooth_power_limits_comet_CE.csv
index 901ff07..5aef29d 100644
--- a/bluetooth/bluetooth_power_limits_comet_CE.csv
+++ b/bluetooth/bluetooth_power_limits_comet_CE.csv
@@ -1,71 +1,71 @@
-Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
-off,off,off,off,off,off,on,78,68,30,78,68,30,66,56,18,66,56,18
-off,off,off,off,off,on,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,off,off,on,off,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,off,off,on,on,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,off,on,off,off,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,off,on,off,on,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,off,on,on,off,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,off,on,on,on,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,on,off,off,off,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,on,off,off,on,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,on,off,on,off,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,on,off,on,on,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,on,on,off,off,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,on,on,off,on,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,on,on,on,off,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,on,on,on,on,on,78,68,30,74,68,30,66,56,18,66,56,18
-off,on,off,off,off,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,off,off,off,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,off,off,on,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,off,off,on,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,off,on,off,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,off,on,off,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,off,on,on,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,off,on,on,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,on,off,off,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,on,off,off,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,on,off,on,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,on,off,on,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,on,on,off,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,on,on,off,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,on,on,on,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,on,on,on,on,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-off,off,off,any,off,any,off,78,68,30,78,68,30,66,56,18,66,56,18
-off,off,on,any,off,any,off,78,68,30,74,68,30,66,56,18,66,56,18
-off,off,off,any,on,any,off,78,68,30,74,68,30,66,56,18,66,56,18
-on,off,off,off,off,off,on,78,68,30,78,68,30,66,56,18,66,56,18
-on,off,off,off,off,on,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,off,off,on,off,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,off,off,on,on,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,off,on,off,off,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,off,on,off,on,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,off,on,on,off,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,off,on,on,on,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,on,off,off,off,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,on,off,off,on,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,on,off,on,off,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,on,off,on,on,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,on,on,off,off,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,on,on,off,on,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,on,on,on,off,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,on,on,on,on,on,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,off,off,off,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,off,off,off,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,off,off,on,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,off,off,on,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,off,on,off,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,off,on,off,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,off,on,on,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,off,on,on,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,on,off,off,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,on,off,off,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,on,off,on,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,on,off,on,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,on,on,off,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,on,on,off,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,on,on,on,off,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,on,on,on,on,on,any,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,off,any,off,any,off,78,68,30,78,68,30,66,56,18,66,56,18
-on,off,on,any,off,any,off,78,68,30,68,68,30,66,56,18,66,56,18
-on,off,off,any,on,any,off,78,68,30,68,68,30,66,56,18,66,56,18
+Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1
+off,off,off,off,off,off,on,78,68,30,68,78,68,30,68,66,56,18,56,66,56,18,56
+off,off,off,off,off,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,off,off,on,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,off,off,on,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,off,on,off,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,off,on,off,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,off,on,on,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,off,on,on,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,on,off,off,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,on,off,off,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,on,off,on,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,on,off,on,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,on,on,off,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,on,on,off,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,on,on,on,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,on,on,on,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,on,off,off,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,off,off,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,off,off,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,off,off,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,off,on,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,off,on,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,off,on,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,off,on,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,on,off,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,on,off,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,on,off,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,on,off,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,on,on,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,on,on,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,on,on,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,on,on,on,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+off,off,off,any,off,any,off,78,68,30,68,78,68,30,68,66,56,18,56,66,56,18,56
+off,off,on,any,off,any,off,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+off,off,off,any,on,any,off,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
+on,off,off,off,off,off,on,78,68,30,68,78,68,30,68,66,56,18,56,66,56,18,56
+on,off,off,off,off,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,off,off,on,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,off,off,on,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,off,on,off,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,off,on,off,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,off,on,on,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,off,on,on,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,on,off,off,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,on,off,off,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,on,off,on,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,on,off,on,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,on,on,off,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,on,on,off,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,on,on,on,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,on,on,on,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,off,off,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,off,off,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,off,off,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,off,off,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,off,on,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,off,on,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,off,on,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,off,on,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,on,off,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,on,off,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,on,off,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,on,off,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,on,on,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,on,on,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,on,on,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,on,on,on,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,off,any,off,any,off,78,68,30,68,78,68,30,68,66,56,18,56,66,56,18,56
+on,off,on,any,off,any,off,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
+on,off,off,any,on,any,off,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
diff --git a/bluetooth/bluetooth_power_limits_comet_US.csv b/bluetooth/bluetooth_power_limits_comet_US.csv
index 5cdbb3c..d516bb6 100644
--- a/bluetooth/bluetooth_power_limits_comet_US.csv
+++ b/bluetooth/bluetooth_power_limits_comet_US.csv
@@ -1,71 +1,71 @@
-Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
-off,off,off,off,off,off,on,78,68,78,78,68,78,66,56,66,66,56,66
-off,off,off,off,off,on,on,78,68,78,78,68,78,66,56,66,66,56,66
-off,off,off,off,on,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,off,on,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,on,off,off,on,78,68,78,78,68,78,66,56,66,66,56,66
-off,off,off,on,off,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,on,on,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,on,on,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,off,off,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,off,off,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,off,on,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,off,on,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,on,off,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,on,off,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,on,on,off,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,on,on,on,on,on,78,68,78,68,68,68,66,56,66,66,56,66
-off,on,off,off,off,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,off,off,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,off,on,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,off,on,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,on,off,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,on,off,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,on,on,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,off,on,on,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,off,off,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,off,off,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,off,on,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,off,on,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,on,off,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,on,off,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,on,on,off,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,on,on,on,on,on,any,72,68,72,40,40,40,40,40,40,40,40,40
-off,off,off,any,off,any,off,78,68,78,78,68,78,66,56,66,66,56,66
-off,off,on,any,off,any,off,78,68,78,68,68,68,66,56,66,66,56,66
-off,off,off,any,on,any,off,78,68,78,68,68,68,66,56,66,66,56,66
-on,off,off,off,off,off,on,78,68,78,78,68,78,66,56,66,66,56,66
-on,off,off,off,off,on,on,78,68,78,76,68,76,66,56,66,66,56,66
-on,off,off,off,on,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,off,on,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,on,off,off,on,78,68,78,76,68,76,66,56,66,66,56,66
-on,off,off,on,off,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,on,on,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,on,on,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,off,off,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,off,off,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,off,on,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,off,on,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,on,off,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,on,off,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,on,on,off,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,on,on,on,on,on,78,68,78,62,62,62,62,56,62,62,56,62
-on,on,off,off,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,off,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,off,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,off,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,on,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,on,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,on,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,off,on,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,off,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,off,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,off,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,off,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,on,off,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,on,off,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,on,on,off,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,on,on,on,on,on,any,78,68,78,50,50,50,50,50,50,50,50,50
-on,off,off,any,off,any,off,78,68,78,78,68,78,66,56,66,66,56,66
-on,off,on,any,off,any,off,78,68,78,62,62,62,62,56,62,62,56,62
-on,off,off,any,on,any,off,78,68,78,62,62,62,62,56,62,62,56,62
+Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1
+off,off,off,off,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+off,off,off,off,off,on,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+off,off,off,off,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,off,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,on,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+off,off,off,on,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,on,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,on,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,off,off,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,off,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,off,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,off,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,on,off,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,on,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,on,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,on,on,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,on,off,off,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,off,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,off,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,off,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,on,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,on,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,on,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,off,on,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,off,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,off,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,off,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,off,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,on,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,on,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,on,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,on,on,on,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
+off,off,off,any,off,any,off,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+off,off,on,any,off,any,off,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+off,off,off,any,on,any,off,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
+on,off,off,off,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+on,off,off,off,off,on,on,78,68,78,68,76,68,76,68,66,56,66,56,66,56,66,56
+on,off,off,off,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,off,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,on,off,off,on,78,68,78,68,76,68,76,68,66,56,66,56,66,56,66,56
+on,off,off,on,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,on,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,on,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,off,off,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,off,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,off,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,off,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,on,off,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,on,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,on,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,on,on,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,on,off,off,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,off,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,off,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,off,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,on,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,on,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,on,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,off,on,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,off,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,off,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,off,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,off,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,on,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,on,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,on,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,on,on,on,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
+on,off,off,any,off,any,off,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
+on,off,on,any,off,any,off,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+on,off,off,any,on,any,off,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index 3750cba..7670b5a 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -30,3 +30,11 @@ BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 BtOpusEnabled = true
 
 AccelBtDisable = false
+
+BtHalRecoveryByRestart = true
+
+BtHalBqrEnable = true
+
+# <string> The hardware stage with old chip revision is no longer
+# # supported by BT firmware.
+HwStageWithOldChipFwNoLongerSupport = EVT1.0-PROTO1.0-PROTO1.1
diff --git a/conf/init.comet.rc b/conf/init.comet.rc
index 29f0949..70c2c0c 100644
--- a/conf/init.comet.rc
+++ b/conf/init.comet.rc
@@ -68,6 +68,12 @@ on property:vendor.thermal.link_ready=1
     chown system system /dev/thermal/tz-by-name/charger_therm/trip_point_0_hyst
     chown system system /dev/thermal/tz-by-name/batoilo2/trip_point_0_temp
     chown system system /dev/thermal/tz-by-name/batoilo2/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/gnss_tcxo_therm/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/gnss_tcxo_therm/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/modem_therm/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/modem_therm/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/rffe_therm/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/rffe_therm/trip_point_0_hyst
 
 # ODPM
 on early-boot && property:ro.boot.hardware.sku=GC15S
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 8c6983b..90d0ac0 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework">
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>10</version>
+        <version>11</version>
         <interface>
             <name>IDisplay</name>
             <instance>secondary</instance>
diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index 9dd09d1..c901e30 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -15,6 +15,11 @@
             "Type": "UNKNOWN",
             "Multiplier": 0.001
         },
+        {
+            "Name": "maxfg_secondary",
+            "Type": "UNKNOWN",
+            "Multiplier": 0.001
+        },
         {
             "Name": "soc",
             "Type": "BCL_PERCENTAGE",
@@ -38,26 +43,38 @@
         {
             "Name": "soc_therm",
             "Type": "UNKNOWN",
+            "HotThreshold": ["NaN", 34.29, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "TempPath": "/dev/thermal/tz-by-name/soc_therm/tz_temp",
-            "Multiplier": 0.001
+            "Multiplier": 0.001,
+            "PollingDelay": 300000,
+            "PassiveDelay": 7000
         },
         {
             "Name": "rffe_therm",
             "Type": "UNKNOWN",
+            "HotThreshold": ["NaN", 35.07, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "TempPath": "/dev/thermal/tz-by-name/rffe_therm/tz_temp",
-            "Multiplier": 0.001
+            "Multiplier": 0.001,
+            "PollingDelay": 300000,
+            "PassiveDelay": 7000
         },
         {
             "Name": "modem_therm",
             "Type": "UNKNOWN",
+            "HotThreshold": ["NaN", 33.31, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "TempPath": "/dev/thermal/tz-by-name/modem_therm/tz_temp",
-            "Multiplier": 0.001
+            "Multiplier": 0.001,
+            "PollingDelay": 300000,
+            "PassiveDelay": 7000
         },
         {
             "Name": "gnss_tcxo_therm",
             "Type": "UNKNOWN",
+            "HotThreshold": ["NaN", 32.08, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "TempPath": "/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
-            "Multiplier": 0.001
+            "Multiplier": 0.001,
+            "PollingDelay": 300000,
+            "PassiveDelay": 7000
         },
         {
             "Name": "usb_conn_therm",
@@ -71,12 +88,24 @@
         {
             "Name": "charger_therm",
             "Type": "UNKNOWN",
-            "HotThreshold": ["NAN", 34.89, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold": ["NAN", 37.25, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath": "/dev/thermal/tz-by-name/charger_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
         },
+        {
+            "Name": "inner_display_therm",
+            "Type": "UNKNOWN",
+            "TempPath": "/dev/thermal/tz-by-name/inner_display_therm/tz_temp",
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "display_therm",
+            "Type": "UNKNOWN",
+            "TempPath": "/dev/thermal/tz-by-name/display_therm/tz_temp",
+            "Multiplier": 0.001
+        },
         {
             "Name": "inner_brightness",
             "Type": "UNKNOWN",
@@ -106,19 +135,79 @@
             "Multiplier": 1
         },
         {
-            "Name": "VIRTUAL-SKIN-OPEN",
+            "Name": "VIRTUAL-SKIN-OPEN-SUB-1",
             "Type": "UNKNOWN",
             "Hidden": true,
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
-            "Combination": [
-                "soc_therm",
-                "rffe_therm",
-                "modem_therm",
-                "gnss_tcxo_therm"
-            ],
-            "Coefficient": [0.119, 0.103, 0.481, 0.288],
-            "Offset": -203,
+            "Combination": ["charger_therm", "modem_therm", "gnss_tcxo_therm"],
+            "Coefficient": [0.144, 0.448, 0.402],
+            "Offset": -1113,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-OPEN-SUB-2",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["charger_therm", "modem_therm", "inner_display_therm", "display_therm", "gnss_tcxo_therm"],
+            "Coefficient": [0.12, 0.12, 0.37, 0.32, 0.12],
+            "Offset": -30,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-OPEN",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "MAXIMUM",
+            "Combination": ["VIRTUAL-SKIN-OPEN-SUB-1", "VIRTUAL-SKIN-OPEN-SUB-2"],
+            "Coefficient": [1.0, 1.0],
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-CLOSE-SUB-1",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["rffe_therm", "charger_therm", "gnss_tcxo_therm"],
+            "Coefficient": [0.588, 0.066, 0.306],
+            "Offset": 967,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-CLOSE-SUB-2",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["soc_therm", "rffe_therm"],
+            "Coefficient": [0.294, 0.664],
+            "Offset": 388,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-CLOSE-SUB-3",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["modem_therm", "gnss_tcxo_therm"],
+            "Coefficient": [0.65, 0.35],
+            "Offset": -1825,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-CLOSE-SUB-4",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["rffe_therm", "usb_conn_therm", "inner_display_therm", "display_therm", "gnss_tcxo_therm", "maxfg_base", "maxfg_secondary"],
+            "Coefficient": [0.03, 0.096, 0.03, 0.78, 0.03, 0.03, 0.09],
+            "Offset": -2730,
             "Multiplier": 0.001
         },
         {
@@ -126,18 +215,17 @@
             "Type": "UNKNOWN",
             "Hidden": true,
             "VirtualSensor": true,
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["soc_therm", "rffe_therm", "modem_therm"],
-            "Coefficient": [0.223, 0.175, 0.493],
-            "Offset": 2631,
+            "Formula": "MAXIMUM",
+            "Combination": ["VIRTUAL-SKIN-CLOSE-SUB-1", "VIRTUAL-SKIN-CLOSE-SUB-2", "VIRTUAL-SKIN-CLOSE-SUB-3", "VIRTUAL-SKIN-CLOSE-SUB-4"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0],
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN",
             "Type": "SKIN",
-            "Version": "0.1",
+            "Version": "2.0",
             "VirtualSensor": true,
-            "TriggerSensor": "charger_therm",
+            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
             "Formula": "WEIGHTED_AVG",
             "Combination": ["VIRTUAL-SKIN-OPEN", "VIRTUAL-SKIN-CLOSE"],
             "Coefficient": ["OPEN_WEIGHT", "CLOSE_WEIGHT"],
@@ -164,7 +252,7 @@
             "Type": "UNKNOWN",
             "Hidden": true,
             "VirtualSensor": true,
-            "TriggerSensor": "charger_therm",
+            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
             "Formula": "MAXIMUM",
             "Combination": ["VIRTUAL-SKIN"],
             "Coefficient": [1.0],
@@ -180,7 +268,7 @@
             "Type": "UNKNOWN",
             "Hidden": true,
             "VirtualSensor": true,
-            "TriggerSensor": "charger_therm",
+            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
             "Formula": "MAXIMUM",
             "Combination": ["VIRTUAL-SKIN"],
             "Coefficient": [1.0],
@@ -257,7 +345,7 @@
             "Type": "UNKNOWN",
             "Hidden": true,
             "VirtualSensor": true,
-            "TriggerSensor": "charger_therm",
+            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
             "Formula": "MAXIMUM",
             "Combination": ["VIRTUAL-SKIN"],
             "Coefficient": [1.0],
@@ -348,7 +436,7 @@
             "Type": "UNKNOWN",
             "Hidden": true,
             "VirtualSensor": true,
-            "TriggerSensor": "charger_therm",
+            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
             "Formula": "MAXIMUM",
             "Combination": ["VIRTUAL-SKIN"],
             "Coefficient": [1.0],
@@ -451,7 +539,7 @@
             "Type": "UNKNOWN",
             "Hidden": true,
             "VirtualSensor": true,
-            "TriggerSensor": "charger_therm",
+            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
             "Formula": "MAXIMUM",
             "Combination": ["VIRTUAL-SKIN"],
             "Coefficient": [1.0],
@@ -515,7 +603,7 @@
             "Type": "UNKNOWN",
             "Hidden": true,
             "VirtualSensor": true,
-            "TriggerSensor": "charger_therm",
+            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
             "Formula": "MAXIMUM",
             "Combination": ["VIRTUAL-SKIN"],
             "Coefficient": [1.0],
@@ -547,7 +635,7 @@
             "Name": "cellular-emergency",
             "Type": "POWER_AMPLIFIER",
             "VirtualSensor": true,
-            "TriggerSensor": "charger_therm",
+            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
             "Formula": "MAXIMUM",
             "Combination": ["VIRTUAL-SKIN"],
             "Coefficient": [1.0],
@@ -563,7 +651,7 @@
             "Type": "DISPLAY",
             "Version": "1.0",
             "VirtualSensor": true,
-            "TriggerSensor": "charger_therm",
+            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
             "Formula": "MAXIMUM",
             "Combination": ["VIRTUAL-SKIN"],
             "Coefficient": [1.0],
@@ -579,7 +667,7 @@
             "Type": "UNKNOWN",
             "Version": "0.1",
             "VirtualSensor": true,
-            "TriggerSensor": "charger_therm",
+            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
             "Formula": "MAXIMUM",
             "Combination": ["VIRTUAL-SKIN"],
             "Coefficient": [1.0],