diff --git a/BoardConfig.mk b/BoardConfig.mk
index 16d96b61..a0c27247 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -89,6 +89,7 @@ TARGET_ANDROID_FILESYSTEM_CONFIG_H := device/google/wahoo/android_filesystem_con
 
 QCOM_BOARD_PLATFORMS += msm8998
 BOARD_HAVE_BLUETOOTH_QCOM := true
+BOARD_USES_SDM845_BLUETOOTH_HAL := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/google/wahoo/bluetooth
 
 # Camera
diff --git a/device.mk b/device.mk
index adf24cd2..49859a80 100755
--- a/device.mk
+++ b/device.mk
@@ -327,10 +327,9 @@ PRODUCT_PACKAGES += \
 
 # Bluetooth HAL
 PRODUCT_PACKAGES += \
-    libbt-vendor \
-    android.hardware.bluetooth@1.0-impl:64 \
-    android.hardware.bluetooth@1.0-service \
-    wcnss_filter
+    android.hardware.bluetooth@1.0-impl-qti:64 \
+    android.hardware.bluetooth@1.0-service-qti \
+    android.hardware.bluetooth@1.0-service-qti.rc
 
 # DRM HAL
 PRODUCT_PACKAGES += \
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 1079d070..ddca8dec 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -183,6 +183,7 @@
 /vendor/bin/init\.power\.sh     u:object_r:init_power_exec:s0
 /vendor/bin/init\.radio\.sh     u:object_r:init_radio_exec:s0
 
+/vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service-qti          u:object_r:hal_bluetooth_default_exec:s0
 /vendor/bin/hw/android\.hardware\.drm@1\.0-service\.widevine          u:object_r:hal_drm_widevine_exec:s0
 /vendor/bin/hw/android\.hardware\.drm@1\.1-service\.clearkey          u:object_r:hal_drm_clearkey_exec:s0
 /vendor/bin/hw/android\.hardware\.vibrator@1\.2-service\.wahoo        u:object_r:hal_vibrator_default_exec:s0
diff --git a/sepolicy/vendor/hal_bluetooth_default.te b/sepolicy/vendor/hal_bluetooth_default.te
index d345ee72..fa6ba605 100644
--- a/sepolicy/vendor/hal_bluetooth_default.te
+++ b/sepolicy/vendor/hal_bluetooth_default.te
@@ -7,3 +7,15 @@ allow hal_bluetooth fwk_scheduler_hwservice:hwservice_manager find;
 allow hal_bluetooth system_server:binder call;
 
 set_prop(hal_bluetooth_default, wc_prop)
+
+userdebug_or_eng(`
+  allow hal_bluetooth_default diag_device:chr_file rw_file_perms;
+  allow hal_bluetooth_default ramdump_vendor_data_file:dir w_dir_perms;
+  allow hal_bluetooth_default ramdump_vendor_data_file:file { create w_file_perms };
+  allow hal_bluetooth_default sysfs_timestamp_switch:file r_file_perms;
+  r_dir_file(hal_bluetooth_default, debugfs_ipc)
+  r_dir_file(hal_bluetooth_default, sysfs_diag)
+  set_prop(hal_bluetooth_default, ssr_prop)
+')
+
+dontaudit hal_bluetooth_default diag_device:chr_file rw_file_perms;