diff --git a/manifest.xml b/manifest.xml
index 54504e7..edb3dce 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -19,7 +19,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
             <name>IBluetoothHci</name>
@@ -59,7 +59,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.gnss</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
             <name>IGnss</name>
@@ -113,7 +113,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.keymaster</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>3.0</version>
         <interface>
             <name>IKeymasterDevice</name>
@@ -144,7 +144,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.memtrack</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
             <name>IMemtrack</name>
diff --git a/msm8974.mk b/msm8974.mk
index 0db57f5..1a49756 100644
--- a/msm8974.mk
+++ b/msm8974.mk
@@ -63,6 +63,7 @@ PRODUCT_PACKAGES += \
 # Bluetooth
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0-impl \
+    android.hardware.bluetooth@1.0-service \
     libbt-vendor
 
 # Boot animation
@@ -75,6 +76,7 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.composer@2.1-impl \
     android.hardware.graphics.mapper@2.0-impl-2.1 \
     android.hardware.memtrack@1.0-impl \
+    android.hardware.memtrack@1.0-service \
     copybit.msm8974 \
     gralloc.msm8974 \
     hwcomposer.msm8974 \
@@ -103,6 +105,7 @@ PRODUCT_PACKAGES += \
 # GPS
 PRODUCT_PACKAGES += \
     android.hardware.gnss@1.0-impl \
+    android.hardware.gnss@1.0-service \
     gps.msm8974
 
 PRODUCT_COPY_FILES += \
@@ -121,7 +124,8 @@ PRODUCT_COPY_FILES += \
 
 # Keymaster
 PRODUCT_PACKAGES += \
-    android.hardware.keymaster@3.0-impl
+    android.hardware.keymaster@3.0-impl \
+    android.hardware.keymaster@3.0-service
 
 # Lights
 PRODUCT_PACKAGES += \
diff --git a/sepolicy/common/hal_bluetooth_default.te b/sepolicy/common/hal_bluetooth_default.te
new file mode 100644
index 0000000..33aa630
--- /dev/null
+++ b/sepolicy/common/hal_bluetooth_default.te
@@ -0,0 +1,9 @@
+allow hal_bluetooth_default {
+  bt_fw_file
+  wifi_data_file
+}:file r_file_perms;
+
+allow hal_bluetooth_default bluetooth_device:chr_file w_file_perms;
+allow hal_bluetooth_default firmware_file:dir r_dir_perms;
+allow hal_bluetooth_default proc_bt_sleep:dir w_dir_perms;
+allow hal_bluetooth_default proc_bt_sleep:file w_file_perms;