diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk
index f3bbebb..9165ac0 100644
--- a/bluetooth/qti_default.mk
+++ b/bluetooth/qti_default.mk
@@ -68,7 +68,9 @@ else ifeq ($(TARGET_USE_QTI_BT_SAR),true)
 endif
 PRODUCT_PACKAGES += \
 	android.hardware.bluetooth@1.0-service-qti \
-	hardware.google.bluetooth.bt_channel_avoidance@1.0-impl
+	hardware.google.bluetooth.bt_channel_avoidance@1.0-impl \
+	android.hardware.bluetooth.prebuilt.xml \
+	android.hardware.bluetooth_le.prebuilt.xml
 
 # Bluetooth SAR Tx power caps
 PRODUCT_COPY_FILES += \
diff --git a/device-lynx.mk b/device-lynx.mk
index d5fd4c5..f61c17f 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -146,7 +146,9 @@ endif
 
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES += \
-	ro.vendor.vibrator.hal.supported_primitives=243
+	ro.vendor.vibrator.hal.supported_primitives=243 \
+	ro.vendor.vibrator.hal.f0.comp.enabled=1 \
+	ro.vendor.vibrator.hal.redc.comp.enabled=0
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts