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 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/powerhint-comet.json b/powerhint-comet.json
index 2fcc7f4..44653f9 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -297,7 +297,6 @@
         "0x0",
         "0x80"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -1413,12 +1412,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "SysGroupCfsSkipMask",
-      "Duration": 0,
-      "Value": "0x80"
-    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "PerTaskMaxIowaitBoost",