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/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_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..522c721 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..fb82a78 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_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..a844b03 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/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index e593d7e..9343381 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -14,7 +14,7 @@ UserialTypePriority = 2-1
 BtOffloadCap = AOC
 
 # <string> The BT Offload Trunk Flag Group Name
-BtOffloadTrunkGroup = 24P_AOC
+BtOffloadTrunkGroup = 24F_AOC
 
 # <boolean> Enable check whether let aoc controls power pin
 AocPowerPinCtrlCheckEnable = true
diff --git a/comet/BoardConfig.mk b/comet/BoardConfig.mk
index c79c97e..5a65e1b 100644
--- a/comet/BoardConfig.mk
+++ b/comet/BoardConfig.mk
@@ -30,6 +30,7 @@ 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/device-comet.mk b/device-comet.mk
index 6e9e04e..5fc689f 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -67,6 +67,7 @@ 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
@@ -529,8 +530,9 @@ 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/location/user/gps.cfg b/location/user/gps.cfg
index 02a8a82..63f8273 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -114,8 +114,11 @@ 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
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 9a6e6c6..b5485f0 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -270,8 +270,11 @@ 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
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 2fcc7f4..13c68ae 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -170,7 +170,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -297,7 +296,6 @@
         "0x0",
         "0x80"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -484,7 +482,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -524,7 +521,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -1413,12 +1409,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "SysGroupCfsSkipMask",
-      "Duration": 0,
-      "Value": "0x80"
-    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "PerTaskMaxIowaitBoost",