diff --git a/device.mk b/device.mk
index 841f1aa..a49e91a 100644
--- a/device.mk
+++ b/device.mk
@@ -23,6 +23,7 @@ DEVICE_PACKAGE_OVERLAYS += \
 # Include common product fragments
 include $(CM_PATH)/common/ant.mk
 include $(CM_PATH)/common/audio.mk
+include $(CM_PATH)/common/bluetooth-le.mk
 include $(CM_PATH)/common/consumerir.mk
 include $(CM_PATH)/common/fingerprint.mk
 include $(CM_PATH)/common/gello.mk
diff --git a/product/init.mk b/product/init.mk
index f96bf84..c6d3875 100644
--- a/product/init.mk
+++ b/product/init.mk
@@ -1,4 +1,7 @@
 # Init scripts
+PRODUCT_PACKAGES += \
+    init.qcom.bt.sh
+
 PRODUCT_PACKAGES += \
     fstab.qcom \
     init.qcom.rc \
diff --git a/product/qcom-bluetooth.mk b/product/qcom-bluetooth.mk
deleted file mode 100644
index f96855d..0000000
--- a/product/qcom-bluetooth.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Init
-PRODUCT_PACKAGES += \
-    init.qcom.bt.sh
-
-# Permissions
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
-    frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml