diff --git a/BoardConfig.mk b/BoardConfig.mk
index 229abae..3748451 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -79,9 +79,6 @@ BOARD_SUPPORTS_SOUND_TRIGGER := true
BOARD_USES_ALSA_AUDIO := true
USE_CUSTOM_AUDIO_POLICY := 1
-# Bluetooth
-TARGET_USE_QTI_BT_STACK := true
-
# Display
SOONG_CONFIG_qtidisplay_udfps := true
TARGET_SCREEN_DENSITY := 420
diff --git a/configs/audio/audio_policy_configuration.xml b/configs/audio/audio_policy_configuration.xml
new file mode 100644
index 0000000..86404f2
--- /dev/null
+++ b/configs/audio/audio_policy_configuration.xml
@@ -0,0 +1,440 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - Earpiece
+ - Speaker
+ - Telephony Tx
+ - Built-In Mic
+ - Built-In Back Mic
+ - FM Tuner
+ - Telephony Rx
+
+ Speaker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/configs/audio/audio_policy_configuration_a2dp_offload_disabled.xml b/configs/audio/audio_policy_configuration_a2dp_offload_disabled.xml
new file mode 100644
index 0000000..a1eaa6f
--- /dev/null
+++ b/configs/audio/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -0,0 +1,419 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - Earpiece
+ - Speaker
+ - Telephony Tx
+ - Built-In Mic
+ - Built-In Back Mic
+ - FM Tuner
+ - Telephony Rx
+
+ Speaker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/configs/audio/bluetooth_hearing_aid_audio_policy_configuration.xml b/configs/audio/bluetooth_hearing_aid_audio_policy_configuration.xml
new file mode 100644
index 0000000..eddd371
--- /dev/null
+++ b/configs/audio/bluetooth_hearing_aid_audio_policy_configuration.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/device.mk b/device.mk
index 60ee431..84af3f6 100644
--- a/device.mk
+++ b/device.mk
@@ -149,6 +149,15 @@ PRODUCT_PACKAGES += \
libvolumelistener \
sound_trigger.primary.lahaina
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik_qssi/audio_policy_configuration.xml \
+ $(LOCAL_PATH)/configs/audio/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \
+ $(LOCAL_PATH)/configs/audio/bluetooth_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_hearing_aid_audio_policy_configuration.xml
+
+PRODUCT_COPY_FILES += \
+ frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml
+
# Bluetooth
PRODUCT_PACKAGES += \
android.hardware.bluetooth@1.0.vendor \
diff --git a/properties/system.prop b/properties/system.prop
index c19faa1..c1efad3 100644
--- a/properties/system.prop
+++ b/properties/system.prop
@@ -3,7 +3,6 @@ use.voice.path.for.pcm.voip=true
# Bluetooth
persist.vendor.bluetooth.modem_nv_support=true
-ro.bluetooth.library_name=libbluetooth_qti.so
# Camera
camera.disable_zsl_mode=true
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 8c78e59..f710941 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -129,7 +129,6 @@ vendor/etc/audio/sku_yupik/mixer_paths_yupikqrd.xml
vendor/etc/audio/sku_yupik/r_submix_audio_policy_configuration.xml
vendor/etc/audio/sku_yupik/sound_trigger_mixer_paths_yupikqrd.xml
vendor/etc/audio/sku_yupik/sound_trigger_platform_info.xml
-vendor/etc/audio/sku_yupik_qssi/audio_policy_configuration.xml
vendor/etc/audio/sku_yupik_qssi/audio_policy_volumes.xml
vendor/etc/audio/sku_yupik_qssi/default_volume_tables.xml
vendor/etc/audio_effects.xml
@@ -138,7 +137,6 @@ vendor/etc/audio_platform_info_intcodec.xml
vendor/etc/audio_platform_info_qrd.xml
vendor/etc/audio_policy_volumes.xml
vendor/etc/audio_tuning_mixer.txt
-vendor/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml
vendor/etc/default_volume_tables.xml
vendor/etc/mixer_paths.xml
vendor/etc/mixer_paths_qrd.xml
@@ -231,16 +229,6 @@ vendor/lib64/libbtnv.so
vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so
vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so
-# Bluetooth (LHDC)
-system/lib/liblhdc.so
-system/lib/liblhdcBT_enc.so
-system/lib/liblhdcv5.so
-system/lib/liblhdcv5BT_enc.so
-system/lib64/liblhdc.so
-system/lib64/liblhdcBT_enc.so
-system/lib64/liblhdcv5.so
-system/lib64/liblhdcv5BT_enc.so
-
# Camera
vendor/etc/camera/camxoverridesettings.txt
vendor/etc/camera/vidhance_calibration