diff --git a/audio/caiman/audio-tables.mk b/audio/caiman/audio-tables.mk
index c571fec2..28f99cff 100644
--- a/audio/caiman/audio-tables.mk
+++ b/audio/caiman/audio-tables.mk
@@ -80,3 +80,10 @@ PRODUCT_COPY_FILES += \
     device/google/caimito/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/caiman/tuning/Android.bp b/audio/caiman/tuning/Android.bp
index 4dfd704d..54e6aa3a 100644
--- a/audio/caiman/tuning/Android.bp
+++ b/audio/caiman/tuning/Android.bp
@@ -128,3 +128,35 @@ prebuilt_etc {
     src: "waves/tests/test_preset.mps",
     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/caiman/tuning/spatializer/base b/audio/caiman/tuning/spatializer/base
new file mode 100644
index 00000000..7d6a7bb0
Binary files /dev/null and b/audio/caiman/tuning/spatializer/base differ
diff --git a/audio/caiman/tuning/spatializer/mode_2_ch b/audio/caiman/tuning/spatializer/mode_2_ch
new file mode 100644
index 00000000..42b89999
Binary files /dev/null and b/audio/caiman/tuning/spatializer/mode_2_ch differ
diff --git a/audio/caiman/tuning/spatializer/mode_6_ch b/audio/caiman/tuning/spatializer/mode_6_ch
new file mode 100644
index 00000000..b9e8240f
Binary files /dev/null and b/audio/caiman/tuning/spatializer/mode_6_ch differ
diff --git a/audio/caiman/tuning/spatializer/mode_xaural b/audio/caiman/tuning/spatializer/mode_xaural
new file mode 100644
index 00000000..b3a3a962
Binary files /dev/null and b/audio/caiman/tuning/spatializer/mode_xaural differ
diff --git a/audio/komodo/audio-tables.mk b/audio/komodo/audio-tables.mk
index e7fb843d..374b7842 100644
--- a/audio/komodo/audio-tables.mk
+++ b/audio/komodo/audio-tables.mk
@@ -80,3 +80,10 @@ PRODUCT_COPY_FILES += \
     device/google/caimito/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/komodo/tuning/Android.bp b/audio/komodo/tuning/Android.bp
index 4dfd704d..54e6aa3a 100644
--- a/audio/komodo/tuning/Android.bp
+++ b/audio/komodo/tuning/Android.bp
@@ -128,3 +128,35 @@ prebuilt_etc {
     src: "waves/tests/test_preset.mps",
     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/komodo/tuning/spatializer/base b/audio/komodo/tuning/spatializer/base
new file mode 100644
index 00000000..7d6a7bb0
Binary files /dev/null and b/audio/komodo/tuning/spatializer/base differ
diff --git a/audio/komodo/tuning/spatializer/mode_2_ch b/audio/komodo/tuning/spatializer/mode_2_ch
new file mode 100644
index 00000000..42b89999
Binary files /dev/null and b/audio/komodo/tuning/spatializer/mode_2_ch differ
diff --git a/audio/komodo/tuning/spatializer/mode_6_ch b/audio/komodo/tuning/spatializer/mode_6_ch
new file mode 100644
index 00000000..b9e8240f
Binary files /dev/null and b/audio/komodo/tuning/spatializer/mode_6_ch differ
diff --git a/audio/komodo/tuning/spatializer/mode_xaural b/audio/komodo/tuning/spatializer/mode_xaural
new file mode 100644
index 00000000..b3a3a962
Binary files /dev/null and b/audio/komodo/tuning/spatializer/mode_xaural differ
diff --git a/audio/tokay/audio-tables.mk b/audio/tokay/audio-tables.mk
index a9993660..15e50240 100644
--- a/audio/tokay/audio-tables.mk
+++ b/audio/tokay/audio-tables.mk
@@ -80,3 +80,10 @@ PRODUCT_COPY_FILES += \
     device/google/caimito/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/tokay/tuning/Android.bp b/audio/tokay/tuning/Android.bp
index 4dfd704d..54e6aa3a 100644
--- a/audio/tokay/tuning/Android.bp
+++ b/audio/tokay/tuning/Android.bp
@@ -128,3 +128,35 @@ prebuilt_etc {
     src: "waves/tests/test_preset.mps",
     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/tokay/tuning/spatializer/base b/audio/tokay/tuning/spatializer/base
new file mode 100644
index 00000000..7d6a7bb0
Binary files /dev/null and b/audio/tokay/tuning/spatializer/base differ
diff --git a/audio/tokay/tuning/spatializer/mode_2_ch b/audio/tokay/tuning/spatializer/mode_2_ch
new file mode 100644
index 00000000..42b89999
Binary files /dev/null and b/audio/tokay/tuning/spatializer/mode_2_ch differ
diff --git a/audio/tokay/tuning/spatializer/mode_6_ch b/audio/tokay/tuning/spatializer/mode_6_ch
new file mode 100644
index 00000000..b9e8240f
Binary files /dev/null and b/audio/tokay/tuning/spatializer/mode_6_ch differ
diff --git a/audio/tokay/tuning/spatializer/mode_xaural b/audio/tokay/tuning/spatializer/mode_xaural
new file mode 100644
index 00000000..b3a3a962
Binary files /dev/null and b/audio/tokay/tuning/spatializer/mode_xaural differ
diff --git a/bluetooth/bt_vendor_overlay_caiman.conf b/bluetooth/bt_vendor_overlay_caiman.conf
index d2bb0806..c793d675 100644
--- a/bluetooth/bt_vendor_overlay_caiman.conf
+++ b/bluetooth/bt_vendor_overlay_caiman.conf
@@ -30,3 +30,5 @@ BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 BtOpusEnabled = true
 
 AccelBtDisable = false
+
+BtHalRecoveryByRestart = true
diff --git a/bluetooth/bt_vendor_overlay_komodo.conf b/bluetooth/bt_vendor_overlay_komodo.conf
index d2bb0806..c793d675 100644
--- a/bluetooth/bt_vendor_overlay_komodo.conf
+++ b/bluetooth/bt_vendor_overlay_komodo.conf
@@ -30,3 +30,5 @@ BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 BtOpusEnabled = true
 
 AccelBtDisable = false
+
+BtHalRecoveryByRestart = true
diff --git a/bluetooth/bt_vendor_overlay_tokay.conf b/bluetooth/bt_vendor_overlay_tokay.conf
index d2bb0806..c793d675 100644
--- a/bluetooth/bt_vendor_overlay_tokay.conf
+++ b/bluetooth/bt_vendor_overlay_tokay.conf
@@ -30,3 +30,5 @@ BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 BtOpusEnabled = true
 
 AccelBtDisable = false
+
+BtHalRecoveryByRestart = true
diff --git a/device-caiman.mk b/device-caiman.mk
index edfc7ef1..389b739c 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -279,6 +279,10 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.als_feed_forward_supported=true \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
+# OIS with system imu
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.ois_with_system_imu=true
+
 # Camera Vendor property
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.front_720P_always_binning=true
diff --git a/device-komodo.mk b/device-komodo.mk
index e7044168..f174a9b9 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -298,6 +298,10 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.als_feed_forward_supported=true \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
+# OIS with system imu
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.ois_with_system_imu=true
+
 # Camera Vendor property
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.front_720P_always_binning=true
diff --git a/device-tokay.mk b/device-tokay.mk
index 1168ddf5..6e8e8b7b 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -268,6 +268,10 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.als_feed_forward_supported=true \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
+# OIS with system imu
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.ois_with_system_imu=true
+
 # Camera Vendor property
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.front_720P_always_binning=true