diff --git a/audio/comet/audio-tables.mk b/audio/comet/audio-tables.mk
index 44ad936..8cf9277 100644
--- a/audio/comet/audio-tables.mk
+++ b/audio/comet/audio-tables.mk
@@ -82,3 +82,10 @@ PRODUCT_COPY_FILES += \
     device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
 
 endif
+
+# Offload spatializer config
+PRODUCT_PACKAGES += \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.base \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural
diff --git a/audio/comet/tuning/Android.bp b/audio/comet/tuning/Android.bp
index e365577..6ce2280 100644
--- a/audio/comet/tuning/Android.bp
+++ b/audio/comet/tuning/Android.bp
@@ -132,3 +132,34 @@ prebuilt_etc {
     soc_specific: true,
 }
 
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base",
+    src: "spatializer/base",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch",
+    src: "spatializer/mode_2_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch",
+    src: "spatializer/mode_6_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural",
+    src: "spatializer/mode_xaural",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
diff --git a/audio/comet/tuning/spatializer/base b/audio/comet/tuning/spatializer/base
new file mode 100644
index 0000000..7d6a7bb
Binary files /dev/null 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
new file mode 100644
index 0000000..42b8999
Binary files /dev/null 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
new file mode 100644
index 0000000..b9e8240
Binary files /dev/null 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
new file mode 100644
index 0000000..b3a3a96
Binary files /dev/null and b/audio/comet/tuning/spatializer/mode_xaural differ
diff --git a/bluetooth/bluetooth_power_limits_comet.csv b/bluetooth/bluetooth_power_limits_comet.csv
index 3ed19ee..5cdbb3c 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,66,54,66,66,54,66,54,42,54,54,42,54
-off,off,off,off,off,on,on,56,54,56,66,54,66,54,42,54,54,42,54
-off,off,off,off,on,off,on,56,54,56,66,54,66,54,42,54,54,42,54
-off,off,off,off,on,on,on,44,44,44,54,54,54,44,42,44,54,42,54
-off,off,off,on,off,off,on,56,54,56,66,54,66,54,42,54,54,42,54
-off,off,off,on,off,on,on,44,44,44,54,54,54,44,42,44,54,42,54
-off,off,off,on,on,off,on,56,54,56,66,54,66,54,42,54,54,42,54
-off,off,off,on,on,on,on,44,44,44,54,54,54,44,42,44,54,42,54
-off,off,on,off,off,off,on,56,54,56,66,54,66,54,42,54,54,42,54
-off,off,on,off,off,on,on,56,54,56,66,54,66,54,42,54,54,42,54
-off,off,on,off,on,off,on,56,54,56,66,54,66,54,42,54,54,42,54
-off,off,on,off,on,on,on,44,44,44,54,54,54,44,42,44,54,42,54
-off,off,on,on,off,off,on,56,54,56,66,54,66,54,42,54,54,42,54
-off,off,on,on,off,on,on,44,44,44,54,54,54,44,42,44,54,42,54
-off,off,on,on,on,off,on,56,54,56,66,54,66,54,42,54,54,42,54
-off,off,on,on,on,on,on,44,44,44,54,54,54,44,42,44,54,42,54
-off,on,off,off,off,off,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,off,off,off,on,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,off,off,on,off,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,off,off,on,on,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,off,on,off,off,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,off,on,off,on,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,off,on,on,off,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,off,on,on,on,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,on,off,off,off,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,on,off,off,on,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,on,off,on,off,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,on,off,on,on,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,on,on,off,off,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,on,on,off,on,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,on,on,on,off,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,on,on,on,on,on,any,48,48,48,66,54,66,46,42,46,54,42,54
-off,off,off,any,off,any,off,66,54,66,66,54,66,54,42,54,54,42,54
-off,off,on,any,off,any,off,44,44,44,54,54,54,44,42,44,54,42,54
-off,off,off,any,on,any,off,44,44,44,54,54,54,44,42,44,54,42,54
-on,off,off,off,off,off,on,66,54,66,66,54,66,54,42,54,54,42,54
-on,off,off,off,off,on,on,54,54,54,54,54,54,54,42,54,54,42,54
-on,off,off,off,on,off,on,54,54,54,54,54,54,54,42,54,54,42,54
-on,off,off,off,on,on,on,38,38,38,42,42,42,36,36,36,36,36,36
-on,off,off,on,off,off,on,54,54,54,54,54,54,54,42,54,54,42,54
-on,off,off,on,off,on,on,38,38,38,42,42,42,36,36,36,36,36,36
-on,off,off,on,on,off,on,54,54,54,54,54,54,54,42,54,54,42,54
-on,off,off,on,on,on,on,38,38,38,42,42,42,36,36,36,36,36,36
-on,off,on,off,off,off,on,54,54,54,54,54,54,54,42,54,54,42,54
-on,off,on,off,off,on,on,54,54,54,54,54,54,54,42,54,54,42,54
-on,off,on,off,on,off,on,54,54,54,54,54,54,54,42,54,54,42,54
-on,off,on,off,on,on,on,38,38,38,42,42,42,36,36,36,36,36,36
-on,off,on,on,off,off,on,54,54,54,54,54,54,54,42,54,54,42,54
-on,off,on,on,off,on,on,38,38,38,42,42,42,36,36,36,36,36,36
-on,off,on,on,on,off,on,54,54,54,54,54,54,54,42,54,54,42,54
-on,off,on,on,on,on,on,38,38,38,42,42,42,36,36,36,36,36,36
-on,on,off,off,off,off,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,off,off,off,on,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,off,off,on,off,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,off,off,on,on,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,off,on,off,off,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,off,on,off,on,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,off,on,on,off,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,off,on,on,on,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,on,off,off,off,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,on,off,off,on,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,on,off,on,off,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,on,off,on,on,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,on,on,off,off,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,on,on,off,on,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,on,on,on,off,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,on,on,on,on,on,any,16,16,16,36,36,36,16,16,16,36,36,36
-on,off,off,any,off,any,off,66,54,66,66,54,66,54,42,54,54,42,54
-on,off,on,any,off,any,off,38,38,38,42,42,42,36,36,36,36,36,36
-on,off,off,any,on,any,off,38,38,38,42,42,42,36,36,36,36,36,36
+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