diff --git a/audio/comet/aidl_config/mixer_paths_aidl.xml b/audio/comet/aidl_config/mixer_paths_aidl.xml
index 8b8c7d4..e077b7e 100644
--- a/audio/comet/aidl_config/mixer_paths_aidl.xml
+++ b/audio/comet/aidl_config/mixer_paths_aidl.xml
@@ -426,6 +426,10 @@
     <path name="primary-playback -> bt" />
   </path>
 
+  <path name="primary-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="primary-playback -> bt" />
+  </path>
+
   <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
@@ -498,6 +502,10 @@
     <path name="raw-playback -> bt" />
   </path>
 
+  <path name="raw-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="raw-playback -> bt" />
+  </path>
+
   <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
@@ -570,6 +578,10 @@
     <path name="deep-buffer-playback -> bt" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
   <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
@@ -647,6 +659,10 @@
     <path name="compress-offload-playback -> bt" />
   </path>
 
+  <path name="compress-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
   <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
@@ -719,6 +735,10 @@
     <path name="mmap-playback -> bt" />
   </path>
 
+  <path name="mmap-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="mmap-playback -> bt" />
+  </path>
+
   <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
@@ -803,6 +823,10 @@
     <path name="voip-playback -> bt" />
   </path>
 
+  <path name="voip-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="voip-playback -> bt" />
+  </path>
+
   <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
@@ -863,6 +887,10 @@
     <path name="immersive-playback -> bt" />
   </path>
 
+  <path name="immersive-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="immersive-playback -> bt" />
+  </path>
+
   <path name="immersive-playback-0 -> usb">
     <ctl name="USB_RX Mixer IMSV" value="1" />
   </path>
@@ -931,6 +959,10 @@
     <path name="spatializer-offload-playback -> bt" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP4" value="1" />
   </path>
@@ -1001,6 +1033,10 @@
     <path name="haptic-playback -> bt" />
   </path>
 
+  <path name="haptic-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="haptic-playback -> bt" />
+  </path>
+
   <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -1211,6 +1247,10 @@
     <path name="voice-call-downlink-0 -> bt" />
   </path>
 
+  <path name="voice-call-downlink-0 -> bluetooth-low-energy-broadcast">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
   <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
diff --git a/audio/comet/audio-tables.mk b/audio/comet/audio-tables.mk
index 3b4bd07..7790a29 100644
--- a/audio/comet/audio-tables.mk
+++ b/audio/comet/audio-tables.mk
@@ -95,7 +95,8 @@ PRODUCT_PACKAGES_DEBUG += \
     template.xml \
     tuning_constraints_combination.xml \
     test_config.ini \
-    test_preset.mps
+    test_preset.mps \
+    speaker_post_processing_volume_spec.xml
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 # Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
diff --git a/audio/comet/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/comet/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
index 8b2af59..efd7277 100644
--- a/audio/comet/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/comet/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,6 +11,7 @@
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
         <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
         <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                      samplingRates="44100 48000"
@@ -51,6 +52,7 @@
         <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
         <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
         <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
     </devicePorts>
     <routes>
         <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
     </routes>
 </module>
\ No newline at end of file
diff --git a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so
index 0bdaff2..6bb4b10 100644
Binary files a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so and b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so differ
diff --git a/audio/comet/tuning/Android.bp b/audio/comet/tuning/Android.bp
index 1ba2220..ca79839 100644
--- a/audio/comet/tuning/Android.bp
+++ b/audio/comet/tuning/Android.bp
@@ -252,6 +252,12 @@ prebuilt_etc {
     soc_specific: true,
 }
 
+prebuilt_etc {
+    name: "speaker_post_processing_volume_spec.xml",
+    src: "pts/speaker_post_processing_volume_spec.xml",
+    defaults: ["aoc_defaults"],
+}
+
 prebuilt_etc {
     name: "waves_config_nx.ini",
     src: "waves/waves_config_nx.ini",
diff --git a/audio/comet/tuning/apmg3/downlink_dock_config.pb b/audio/comet/tuning/apmg3/downlink_dock_config.pb
index 2fdd177..854a48d 100644
Binary files a/audio/comet/tuning/apmg3/downlink_dock_config.pb and b/audio/comet/tuning/apmg3/downlink_dock_config.pb differ
diff --git a/audio/comet/tuning/apmg3/downlink_handset_config.pb b/audio/comet/tuning/apmg3/downlink_handset_config.pb
index a5c2545..0b622ac 100644
Binary files a/audio/comet/tuning/apmg3/downlink_handset_config.pb and b/audio/comet/tuning/apmg3/downlink_handset_config.pb differ
diff --git a/audio/comet/tuning/apmg3/downlink_speaker_config.pb b/audio/comet/tuning/apmg3/downlink_speaker_config.pb
index 53b94d0..f8cee42 100644
Binary files a/audio/comet/tuning/apmg3/downlink_speaker_config.pb and b/audio/comet/tuning/apmg3/downlink_speaker_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb
index 40dd10b..a6dfdce 100644
Binary files a/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb and b/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb
index 2cf3692..58ac211 100644
Binary files a/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb
index 7a9e57d..06e4ef5 100644
Binary files a/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb and b/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb
index a6bb5a4..979a200 100644
Binary files a/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_external_speaker_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_external_speaker_aec_off_config.pb
index 38141ba..7103879 100644
Binary files a/audio/comet/tuning/apmg3/uplink_external_speaker_aec_off_config.pb and b/audio/comet/tuning/apmg3/uplink_external_speaker_aec_off_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_external_speaker_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_external_speaker_aec_on_config.pb
index 6ee72a1..d747bc2 100644
Binary files a/audio/comet/tuning/apmg3/uplink_external_speaker_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_external_speaker_aec_on_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_handset_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_handset_aec_off_config.pb
index 3cdf914..9351945 100644
Binary files a/audio/comet/tuning/apmg3/uplink_handset_aec_off_config.pb and b/audio/comet/tuning/apmg3/uplink_handset_aec_off_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_handset_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_handset_aec_on_config.pb
index f02b8a2..58dc380 100644
Binary files a/audio/comet/tuning/apmg3/uplink_handset_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_handset_aec_on_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_speaker_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_speaker_aec_off_config.pb
index 0ee7764..02348b9 100644
Binary files a/audio/comet/tuning/apmg3/uplink_speaker_aec_off_config.pb and b/audio/comet/tuning/apmg3/uplink_speaker_aec_off_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb
index 182628f..d40e099 100644
Binary files a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_wired_headset_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_wired_headset_aec_off_config.pb
index 3578e0e..679aa66 100644
Binary files a/audio/comet/tuning/apmg3/uplink_wired_headset_aec_off_config.pb and b/audio/comet/tuning/apmg3/uplink_wired_headset_aec_off_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_wired_headset_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_wired_headset_aec_on_config.pb
index 791ff9e..fec3962 100644
Binary files a/audio/comet/tuning/apmg3/uplink_wired_headset_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_wired_headset_aec_on_config.pb differ
diff --git a/audio/comet/tuning/pts/speaker_post_processing_volume_spec.xml b/audio/comet/tuning/pts/speaker_post_processing_volume_spec.xml
new file mode 100644
index 0000000..5bda1b0
--- /dev/null
+++ b/audio/comet/tuning/pts/speaker_post_processing_volume_spec.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" ?>
+<xml>
+    <spec feature="normal" device_state="OPENED">
+        <vol step="1">-55.3429,-56.462852</vol>
+        <vol step="2">-51.476486,-52.629974</vol>
+        <vol step="3">-47.429344,-48.577915</vol>
+        <vol step="4">-44.404938,-45.54104</vol>
+        <vol step="5">-41.34484,-42.47274</vol>
+        <vol step="6">-38.26381,-39.386524</vol>
+        <vol step="7">-35.17891,-36.297333</vol>
+        <vol step="8">-32.07109,-33.184692</vol>
+        <vol step="9">-30.30139,-31.407984</vol>
+        <vol step="10">-28.531578,-29.626408</vol>
+        <vol step="11">-26.762623,-27.840538</vol>
+        <vol step="12">-24.994268,-26.05007</vol>
+        <vol step="13">-23.22528,-24.253963</vol>
+        <vol step="14">-21.460478,-22.458183</vol>
+        <vol step="15">-19.69938,-20.66309</vol>
+        <vol step="16">-17.927505,-18.85597</vol>
+        <vol step="17">-16.149855,-17.04668</vol>
+        <vol step="18">-14.375043,-15.242476</vol>
+        <vol step="19">-12.619692,-13.460893</vol>
+        <vol step="20">-10.988443,-11.807947</vol>
+        <vol step="21">-10.229917,-11.031332</vol>
+        <vol step="22">-10.067055,-10.8566475</vol>
+        <vol step="23">-10.010124,-10.794648</vol>
+        <vol step="24">-9.965792,-10.748672</vol>
+        <vol step="25">-9.924187,-10.708454</vol>
+    </spec>
+
+    <spec feature="normal" device_state="CLOSED">
+        <vol step="1">-56.824966,-56.22085</vol>
+        <vol step="2">-53.00812,-52.39601</vol>
+        <vol step="3">-48.99447,-48.376297</vol>
+        <vol step="4">-45.98986,-45.365585</vol>
+        <vol step="5">-42.94967,-42.31531</vol>
+        <vol step="6">-39.888924,-39.239597</vol>
+        <vol step="7">-36.825584,-36.154556</vol>
+        <vol step="8">-33.740566,-33.03967</vol>
+        <vol step="9">-31.983803,-31.262745</vol>
+        <vol step="10">-30.226,-29.482727</vol>
+        <vol step="11">-28.46655,-27.69943</vol>
+        <vol step="12">-26.707556,-25.915329</vol>
+        <vol step="13">-24.945498,-24.127829</vol>
+        <vol step="14">-23.18879,-22.34605</vol>
+        <vol step="15">-21.434853,-20.568602</vol>
+        <vol step="16">-19.676136,-18.789795</vol>
+        <vol step="17">-17.923016,-17.019646</vol>
+        <vol step="18">-16.179115,-15.263374</vol>
+        <vol step="19">-14.411232,-13.477808</vol>
+        <vol step="20">-12.608496,-11.657543</vol>
+        <vol step="21">-11.418643,-10.450487</vol>
+        <vol step="22">-11.115015,-10.132849</vol>
+        <vol step="23">-11.049253,-10.054632</vol>
+        <vol step="24">-11.009314,-10.004243</vol>
+        <vol step="25">-10.979197,-9.964965</vol>
+    </spec>
+
+    <spec feature="speaker_spatialization" device_state="OPENED">
+        <vol step="1">-48.656296,-50.673286</vol>
+        <vol step="2">-44.69299,-46.81315</vol>
+        <vol step="3">-40.618153,-42.763763</vol>
+        <vol step="4">-37.65023,-39.806267</vol>
+        <vol step="5">-34.71226,-36.89866</vol>
+        <vol step="6">-31.792694,-34.008415</vol>
+        <vol step="7">-28.87659,-31.105488</vol>
+        <vol step="8">-25.919016,-28.141272</vol>
+        <vol step="9">-24.223642,-26.43234</vol>
+        <vol step="10">-22.520838,-24.709074</vol>
+        <vol step="11">-20.81106,-22.973286</vol>
+        <vol step="12">-19.082249,-21.21807</vol>
+        <vol step="13">-17.333406,-19.4436</vol>
+        <vol step="14">-15.581524,-17.667053</vol>
+        <vol step="15">-13.825251,-15.887933</vol>
+        <vol step="16">-12.092208,-14.131317</vol>
+        <vol step="17">-10.732493,-12.741249</vol>
+        <vol step="18">-10.100718,-12.073996</vol>
+        <vol step="19">-9.911014,-11.864244</vol>
+        <vol step="20">-9.836917,-11.782432</vol>
+        <vol step="21">-9.779734,-11.722244</vol>
+        <vol step="22">-9.734992,-11.677365</vol>
+        <vol step="23">-9.6985,-11.645135</vol>
+        <vol step="24">-9.66777,-11.623802</vol>
+        <vol step="25">-9.63527,-11.600014</vol>
+    </spec>
+
+    <spec feature="speaker_spatialization" device_state="CLOSED">
+        <vol step="1">-51.52192,-50.394104</vol>
+        <vol step="2">-47.673805,-46.551804</vol>
+        <vol step="3">-43.651005,-42.548542</vol>
+        <vol step="4">-40.702824,-39.619167</vol>
+        <vol step="5">-37.78776,-36.72528</vol>
+        <vol step="6">-34.883675,-33.843998</vol>
+        <vol step="7">-31.96994,-30.95195</vol>
+        <vol step="8">-29.008202,-28.005291</vol>
+        <vol step="9">-27.310637,-26.311722</vol>
+        <vol step="10">-25.606598,-24.60886</vol>
+        <vol step="11">-23.898502,-22.899467</vol>
+        <vol step="12">-22.189236,-21.187288</vol>
+        <vol step="13">-20.478073,-19.472952</vol>
+        <vol step="14">-18.775997,-17.768572</vol>
+        <vol step="15">-17.08199,-16.07426</vol>
+        <vol step="16">-15.326209,-14.307854</vol>
+        <vol step="17">-13.593147,-12.561827</vol>
+        <vol step="18">-12.172909,-11.130552</vol>
+        <vol step="19">-11.557884,-10.508577</vol>
+        <vol step="20">-11.353183,-10.2964</vol>
+        <vol step="21">-11.280718,-10.217085</vol>
+        <vol step="22">-11.227874,-10.15811</vol>
+        <vol step="23">-11.186886,-10.110628</vol>
+        <vol step="24">-11.15273,-10.070196</vol>
+        <vol step="25">-11.126692,-10.037739</vol>
+    </spec>
+</xml>
\ No newline at end of file
diff --git a/audio/comet/tuning/spatializer/base b/audio/comet/tuning/spatializer/base
index 38cc646..42b4329 100644
Binary files a/audio/comet/tuning/spatializer/base and b/audio/comet/tuning/spatializer/base differ
diff --git a/audio/comet/tuning/spatializer/mode_2_ch b/audio/comet/tuning/spatializer/mode_2_ch
index 470c56c..2610b2d 100644
Binary files a/audio/comet/tuning/spatializer/mode_2_ch and b/audio/comet/tuning/spatializer/mode_2_ch differ
diff --git a/audio/comet/tuning/spatializer/mode_6_ch b/audio/comet/tuning/spatializer/mode_6_ch
index 94ec635..0f432fa 100644
Binary files a/audio/comet/tuning/spatializer/mode_6_ch and b/audio/comet/tuning/spatializer/mode_6_ch differ
diff --git a/audio/comet/tuning/spatializer/mode_xaural b/audio/comet/tuning/spatializer/mode_xaural
index 551959c..2d1e1da 100644
Binary files a/audio/comet/tuning/spatializer/mode_xaural and b/audio/comet/tuning/spatializer/mode_xaural differ
diff --git a/comet/BoardConfig.mk b/comet/BoardConfig.mk
index dbaf783..5a65e1b 100644
--- a/comet/BoardConfig.mk
+++ b/comet/BoardConfig.mk
@@ -21,11 +21,16 @@ TARGET_SCREEN_DENSITY := 390
 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_COMET := true
 
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_COMET_RADIO_DIR)
+RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_COMET_RADIOCFG_DIR)
+RELEASE_GOOGLE_PRODUCT_NTNRADIO_DIR := $(RELEASE_GOOGLE_COMET_NTNRADIO_DIR)
+
 #Display
 USES_IDISPLAY_INTF_SEC := true
 
 include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/comet/proprietary/BoardConfigVendor.mk
 include device/google/comet-sepolicy/comet-sepolicy.mk
 include device/google/comet/wifi/BoardConfig-wifi.mk
diff --git a/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index dd14f6a..36a3c33 100644
--- a/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -184,11 +184,11 @@
     </array>
     <item name="gps.voltage">3700</item>
     <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">79</item>
+    <item name="wifi.controller.idle">31</item>
     <!-- Rx current for wifi radio in mA.-->
-    <item name="wifi.controller.rx">118</item>
+    <item name="wifi.controller.rx">39</item>
     <!-- Tx current for wifi radio in mA-->
-    <item name="wifi.controller.tx">331</item>
+    <item name="wifi.controller.tx">540</item>
     <!-- Operating voltage for wifi radio in mV.-->
-    <item name="wifi.controller.voltage">3700</item>
+    <item name="wifi.controller.voltage">3850</item>
 </device>
diff --git a/comet/overlay/frameworks/base/packages/SystemUI/res/values-sw820dp/dimens.xml b/comet/overlay/frameworks/base/packages/SystemUI/res/values-sw820dp/dimens.xml
index 2c1fcc8..1ac9250 100644
--- a/comet/overlay/frameworks/base/packages/SystemUI/res/values-sw820dp/dimens.xml
+++ b/comet/overlay/frameworks/base/packages/SystemUI/res/values-sw820dp/dimens.xml
@@ -18,7 +18,7 @@
     <dimen name="status_bar_padding_start">0dp</dimen>
 
     <!-- Location on the screen of the center of the physical power button. -->
-    <dimen name="physical_power_button_center_screen_location_y">620px</dimen>
+    <dimen name="physical_power_button_center_screen_location_y">675px</dimen>
 
     <!-- Location on the screen of the center of the physical fingerprint sensor -->
     <dimen name="physical_fingerprint_sensor_center_screen_location_x">2076px</dimen>
diff --git a/comet/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/comet/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 689640c..7d31594 100644
--- a/comet/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/comet/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -17,9 +17,12 @@
 -->
 <resources>
     <!-- Location on the screen of the center of the physical power button. -->
-    <dimen name="physical_power_button_center_screen_location_y">710px</dimen>
+    <dimen name="physical_power_button_center_screen_location_y">765px</dimen>
 
     <!-- Location on the screen of the center of the physical fingerprint sensor -->
     <dimen name="physical_fingerprint_sensor_center_screen_location_x">1080px</dimen>
     <dimen name="physical_fingerprint_sensor_center_screen_location_y">710px</dimen>
+
+    <!-- Volume panel corner radius -->
+    <dimen name="bottom_sheet_corner_radius">52dp</dimen>
 </resources>
diff --git a/conf/init.comet.rc b/conf/init.comet.rc
index c9c59ab..a6b567f 100644
--- a/conf/init.comet.rc
+++ b/conf/init.comet.rc
@@ -7,6 +7,7 @@ on init && property:ro.vendor.factory=1
 on init
     # eSE streset tool name
     setprop persist.vendor.se.streset libstreset24
+    setprop persist.vendor.nfc.streset libstreset24
 # No se_chip_en for P1.0
 on late-init && property:ro.boot.hardware.revision=PROTO1.0
     setprop persist.vendor.se.reset.chip_en false
diff --git a/device-comet.mk b/device-comet.mk
index 6e9e04e..394cbd9 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+SHIPPING_API_LEVEL := 34
+
 ifdef RELEASE_GOOGLE_COMET_RADIO_DIR
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_COMET_RADIO_DIR)
 endif
@@ -63,10 +65,10 @@ endif
 
 include device/google/comet/audio/comet/audio-tables.mk
 include device/google/zumapro/device-shipping-common.mk
-include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/gti/predump_gti_dual.mk
 include device/google/gs-common/display/dump_second_display.mk
+include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk
 
 # Increment the SVN for any official public releases
 ifdef RELEASE_SVN_COMET
@@ -138,8 +140,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	vendor.camera.debug.enable_software_post_sharpen_node=false
 
 # Display Config
-PRODUCT_COPY_FILES += \
-        device/google/comet/display/display_colordata_cal1.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal1.pb
 PRODUCT_PROPERTY_OVERRIDES += \
 	vendor.display.png.premultiplied=true
 
@@ -284,10 +284,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
        ro.audio.spatializer_transaural_enabled_default=false \
        persist.vendor.audio.spatializer.speaker_enabled=true
 
-# declare use of stereo spatialization
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.audio.stereo_spatialization_enabled=true
-
 ifneq ($(USE_AUDIO_HAL_AIDL),true)
 # HIDL Sound Dose
 PRODUCT_PACKAGES += \
@@ -340,6 +336,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += \
     device/google/comet/powerstats/comet
 
+# UWB Overlay
+PRODUCT_PACKAGES += \
+	UwbOverlayCT3
+
 # WiFi Overlay
 PRODUCT_PACKAGES += \
 	WifiOverlay2024Mid_CT3 \
@@ -401,8 +401,8 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
 
-# Media Performance Class 14
-PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34
+# Media Performance Class 15
+PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=35
 
 # OIS with system imu
 PRODUCT_VENDOR_PROPERTIES += \
@@ -487,7 +487,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # LE Audio Unicast Allowlist
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.leaudio.allow_list=SM-R510
+    persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5
 
 # Telephony Satellite Feature
 PRODUCT_COPY_FILES += \
@@ -510,27 +510,22 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
 endif
 
-# Connectivity Resources Overlay
+# Connectivity Resources Overlay for Thread host settings
 PRODUCT_PACKAGES += \
     ConnectivityResourcesOverlayCometOverride
 
+# Thread Dispatcher enablement in Bluetooth HAL
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.thread_dispatcher.enabled=true
-
-# Thread HAL
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-   com.google.comet.hardware.threadnetwork \
-   ThreadNetworkDemoApp
-endif
+    persist.bluetooth.thread_dispatcher.enabled=false
 
 # Camera concurrent foldable dual front feature support
 PRODUCT_PACKAGES += \
     concurrent_foldable_dual_front_xml
 
 # Bluetooth device id
+# Comet: 0x4113
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20499
+    bluetooth.device_id.product_id=16659
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES +=\
diff --git a/display/display_colordata_cal1.pb b/display/display_colordata_cal1.pb
deleted file mode 100644
index b266f90..0000000
Binary files a/display/display_colordata_cal1.pb and /dev/null differ
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 02a8a82..859944c 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -18,6 +18,7 @@ gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc
 gnss_device_data_port_chpp_present=1
 GlueLayer_YearOfHW=2023
 scheduling_enabled=1
+ChipCfg_Timemark_Option=1
 ChipCfg_VDR_high_end_Distance = 200
 ChipCfg_VDR_low_end_Distance = 200
 ChipCfg_VDR_high_end_Time = 20
@@ -54,6 +55,12 @@ GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
 Chip_Configuration_mems_data_Configuration=0x25
+AccelSamplingPeriodUs=10000
+MagnSamplingPeriodUs=10000
+GyroSamplingPeriodUs=10000
+PressSamplingPeriodUs=50000
+OrientationSamplingPeriodUs=10000
+StepCounterSamplingPeriodUs=1000000
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
@@ -72,6 +79,10 @@ SingleBandNmTrkPower=20
 MultiBandNmTrkPower=28
 SingleBandUdTrkPower=14
 MultiBandUdTrkPower=18
+path_delay_glo_12fx_cm = -5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455
+path_delay_gps_2fx_cm = 12342
+path_delay_bds_4fx_cm = 123
+path_delay_l5_20fx_cm = 105916
 RfPathLossDb_Ap=3600
 RfPathLossDb_Cp=3600
 RfPathLossDb_L5_Ap=4300
@@ -110,12 +121,16 @@ ENABLE_LPP_CP=1
 ENABLE_LPP_UP=0
 ENABLE_LPPE_CP=3
 ENABLE_LPPE_UP=0
+ENABLE_NLP_ALONG_WITH_UBP=0
 ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
@@ -125,7 +140,6 @@ ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
 
 GNSS_CARRIER_ID=3
-ENABLE_CAPS_OTDOA=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_SSL_METHOD=TLSv1_2
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 9a6e6c6..26d28a7 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -53,6 +53,9 @@ gnss_device_data_port_chpp_present=1
 GlueLayer_YearOfHW=2023
 scheduling_enabled=1
 
+# 1pps timemark output: 0: disable 1: enable
+ChipCfg_Timemark_Option=1
+
 # VDR End condition (meter, meter, sec, sec)
 ChipCfg_VDR_high_end_Distance = 200
 ChipCfg_VDR_low_end_Distance = 200
@@ -189,6 +192,12 @@ GlueLayer_MeasCorrCap=7
 # 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE
 # 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE
 Chip_Configuration_mems_data_Configuration=0x25
+AccelSamplingPeriodUs=10000
+MagnSamplingPeriodUs=10000
+GyroSamplingPeriodUs=10000
+PressSamplingPeriodUs=50000
+OrientationSamplingPeriodUs=10000
+StepCounterSamplingPeriodUs=1000000
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
@@ -210,6 +219,11 @@ MultiBandNmTrkPower=28
 SingleBandUdTrkPower=14
 MultiBandUdTrkPower=18
 
+path_delay_glo_12fx_cm = -5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455
+path_delay_gps_2fx_cm = 12342
+path_delay_bds_4fx_cm = 123
+path_delay_l5_20fx_cm = 105916
+
 RfPathLossDb_Ap=3600
 RfPathLossDb_Cp=3600
 RfPathLossDb_L5_Ap=4300
@@ -266,12 +280,16 @@ ENABLE_LPP_CP=1
 ENABLE_LPP_UP=0
 ENABLE_LPPE_CP=3
 ENABLE_LPPE_UP=0
+ENABLE_NLP_ALONG_WITH_UBP=0
 ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 # ATT
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 # TMO
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
@@ -281,7 +299,6 @@ ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
 # VZW
 GNSS_CARRIER_ID=3
-ENABLE_CAPS_OTDOA=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_SSL_METHOD=TLSv1_2
diff --git a/manifest.xml b/manifest.xml
index 9f8994b..cf97ba9 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -48,15 +48,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>
diff --git a/powerhint-comet.json b/powerhint-comet.json
index 60ae847..20dcbd4 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -56,6 +56,7 @@
       "Values": [
         "5000",
         "2000",
+        "1000",
         "500"
       ],
       "DefaultIndex": 0,
@@ -94,6 +95,7 @@
       "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us",
       "Values": [
         "20000",
+        "5000",
         "3000",
         "2000",
         "500"
@@ -168,7 +170,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -295,7 +296,6 @@
         "0x0",
         "0x80"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -482,7 +482,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -522,7 +521,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -941,6 +939,25 @@
         "0"
       ],
       "ResetOnInit": false
+    },
+    {
+      "Name": "KswapdUclaimMin",
+      "Path": "/sys/kernel/vendor_mm/kswapd_uclamp_min",
+      "Values": [
+        "0",
+        "200"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "MaxLoadBalanceInterval",
+      "Path": "/proc/vendor_sched/max_load_balance_interval",
+      "Values": [
+        "1",
+        "4"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
     }
   ],
   "Actions": [
@@ -1403,13 +1420,13 @@
     },
     {
       "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "SysGroupCfsSkipMask",
+      "Node": "PerTaskMaxIowaitBoost",
       "Duration": 0,
-      "Value": "0x80"
+      "Value": "0"
     },
     {
       "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "PerTaskMaxIowaitBoost",
+      "Node": "KswapdUclaimMin",
       "Duration": 0,
       "Value": "0"
     },
@@ -2011,13 +2028,13 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CPULittleClusterDownRateLimitUs",
       "Duration": 0,
-      "Value": "5000"
+      "Value": "1000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CPUMidClusterDownRateLimitUs",
       "Duration": 0,
-      "Value": "20000"
+      "Value": "5000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -2103,6 +2120,12 @@
       "Duration": 0,
       "Value": "0x0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "MaxLoadBalanceInterval",
+      "Duration": 0,
+      "Value": "4"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -2185,13 +2208,13 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPULittleClusterDownRateLimitUs",
       "Duration": 0,
-      "Value": "5000"
+      "Value": "1000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUMidClusterDownRateLimitUs",
       "Duration": 0,
-      "Value": "20000"
+      "Value": "5000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -2295,6 +2318,12 @@
       "Duration": 0,
       "Value": "0x80"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "MaxLoadBalanceInterval",
+      "Duration": 0,
+      "Value": "4"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "AutoPreferIdle",
@@ -2383,13 +2412,13 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CPULittleClusterDownRateLimitUs",
       "Duration": 0,
-      "Value": "5000"
+      "Value": "1000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CPUMidClusterDownRateLimitUs",
       "Duration": 0,
-      "Value": "20000"
+      "Value": "5000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2469,6 +2498,12 @@
       "Duration": 0,
       "Value": "0x80"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "MaxLoadBalanceInterval",
+      "Duration": 0,
+      "Value": "4"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "AutoPreferIdle",
@@ -3052,18 +3087,6 @@
       "Duration": 50,
       "Value": "1"
     },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
     {
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "PowerHALRenderingState",
@@ -3563,12 +3586,13 @@
       "Value": "20 80"
     }
   ],
+  "GpuSysfsPath" : "/sys/devices/platform/1f000000.mali",
   "AdpfConfig": [
     {
       "Name": "REFRESH_120FPS",
       "PID_On": true,
       "PID_Po": 2.0,
-      "PID_Pu": 1.0,
+      "PID_Pu": 0.6,
       "PID_I": 0.0,
       "PID_I_Init": 200,
       "PID_I_High": 512,
@@ -3598,7 +3622,9 @@
       "HBoostUclampMinFloorRange": [230, 410],
       "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
-      "MaxRecordsNum": 300
+      "MaxRecordsNum": 300,
+      "GpuBoost": true,
+      "GpuCapacityBoostMax": 40000
     },
     {
       "Name": "REFRESH_90FPS",
@@ -3634,7 +3660,9 @@
       "HBoostUclampMinFloorRange": [230, 410],
       "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
-      "MaxRecordsNum": 300
+      "MaxRecordsNum": 300,
+      "GpuBoost": true,
+      "GpuCapacityBoostMax": 32500
     },
     {
       "Name": "REFRESH_60FPS",
@@ -3670,7 +3698,9 @@
       "HBoostUclampMinFloorRange": [230, 410],
       "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
-      "MaxRecordsNum": 300
+      "MaxRecordsNum": 300,
+      "GpuBoost": true,
+      "GpuCapacityBoostMax": 25000
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -3694,7 +3724,8 @@
       "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 5.0
+      "StaleTimeFactor": 5.0,
+      "GpuBoost": false
     },
     {
       "Name": "UiLowBoostWithoutPid",
@@ -3718,7 +3749,8 @@
       "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 5.0
+      "StaleTimeFactor": 5.0,
+      "GpuBoost": false
     },
     {
       "Name": "UiLowNoneBoost",
@@ -3742,7 +3774,8 @@
       "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 5.0
+      "StaleTimeFactor": 5.0,
+      "GpuBoost": false
     }
   ]
 }
diff --git a/rro_overlays/UwbOverlay/res/values/config.xml b/rro_overlays/UwbOverlay/res/values/config.xml
index bf8d264..a1d0fda 100644
--- a/rro_overlays/UwbOverlay/res/values/config.xml
+++ b/rro_overlays/UwbOverlay/res/values/config.xml
@@ -30,4 +30,12 @@
        * When previously foreground 3p apps moves to background, sessions are not terminated
     -->
     <bool name = "background_ranging_enabled">true</bool>
+
+    <!-- Whether multicast list update notification v2 is supported or not.
+     If enabled, the notification will be parsed into version 2 if uci major version is 2.0. -->
+    <bool name = "is_multicast_list_update_ntf_v2_supported">true</bool>
+
+    <!-- Whether multicast list update response v2 is supported or not.
+     If enabled, the response will be parsed into version 2 if uci major version is 2.0. -->
+    <bool name = "is_multicast_list_update_rsp_v2_supported">true</bool>
 </resources>
diff --git a/thermal/thermal_info_config_backup_comet.json b/thermal/thermal_info_config_backup_comet.json
index 9b57ff9..027782d 100644
--- a/thermal/thermal_info_config_backup_comet.json
+++ b/thermal/thermal_info_config_backup_comet.json
@@ -38,32 +38,27 @@
         {
             "Name": "soc_therm",
             "Type": "UNKNOWN",
-            "TempPath": "/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier": 0.001
         },
         {
             "Name": "rffe_therm",
             "Type": "UNKNOWN",
-            "TempPath": "/dev/thermal/tz-by-name/rffe_therm/tz_temp",
             "Multiplier": 0.001
         },
         {
             "Name": "modem_therm",
             "Type": "UNKNOWN",
-            "TempPath": "/dev/thermal/tz-by-name/modem_therm/tz_temp",
             "Multiplier": 0.001
         },
         {
             "Name": "gnss_tcxo_therm",
             "Type": "UNKNOWN",
-            "TempPath": "/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
             "Multiplier": 0.001
         },
         {
             "Name": "usb_conn_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NAN", 30.79, "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "TempPath": "/dev/thermal/tz-by-name/usb_conn_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
@@ -72,7 +67,6 @@
             "Name": "charger_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NAN", 34.89, "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "TempPath": "/dev/thermal/tz-by-name/charger_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index e4536b5..e08dccd 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -6,10 +6,6 @@
             "HotThreshold": ["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "60.0"],
             "Multiplier": 0.001
         },
-        {
-            "Name": "battery_cycle",
-            "Type": "BCL_VOLTAGE"
-        },
         {
             "Name": "maxfg_base",
             "Type": "UNKNOWN",
@@ -20,26 +16,6 @@
             "Type": "UNKNOWN",
             "Multiplier": 0.001
         },
-        {
-            "Name": "soc",
-            "Type": "BCL_PERCENTAGE",
-            "HotThreshold": ["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"],
-            "Multiplier": 1
-        },
-        {
-            "Name": "BCL_AUDIO_BAACL",
-            "Type": "BCL_VOLTAGE",
-            "VirtualSensor": true,
-            "Formula": "COUNT_THRESHOLD",
-            "TriggerSensor": "soc",
-            "Combination": ["battery", "soc"],
-            "Coefficient": [-25000, 80],
-            "HotThreshold": ["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
-            "PollingDelay": 0,
-            "PassiveDelay": 1000,
-            "Multiplier": 1,
-            "SendCallback": true
-        },
         {
             "Name": "soc_therm",
             "Type": "UNKNOWN",
diff --git a/thermal/thermal_info_config_comet_wingboard.json b/thermal/thermal_info_config_comet_wingboard.json
index aa29f3d..cd50932 100644
--- a/thermal/thermal_info_config_comet_wingboard.json
+++ b/thermal/thermal_info_config_comet_wingboard.json
@@ -6,10 +6,6 @@
       "HotThreshold": ["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "60.0"],
       "Multiplier": 0.001
     },
-    {
-      "Name": "battery_cycle",
-      "Type": "BCL_VOLTAGE"
-    },
     {
       "Name": "maxfg_base",
       "Type": "UNKNOWN",
@@ -20,26 +16,6 @@
       "Type": "UNKNOWN",
       "Multiplier": 0.001
     },
-    {
-      "Name": "soc",
-      "Type": "BCL_PERCENTAGE",
-      "HotThreshold": ["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"],
-      "Multiplier": 1
-    },
-    {
-      "Name": "BCL_AUDIO_BAACL",
-      "Type": "BCL_VOLTAGE",
-      "VirtualSensor": true,
-      "Formula": "COUNT_THRESHOLD",
-      "TriggerSensor": "soc",
-      "Combination": ["battery", "soc"],
-      "Coefficient": [-25000, 80],
-      "HotThreshold": ["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
-      "PollingDelay": 0,
-      "PassiveDelay": 1000,
-      "Multiplier": 1,
-      "SendCallback": true
-    },
     {
       "Name": "soc_therm",
       "Type": "UNKNOWN",