diff --git a/groups/bluetooth/ag620/init.rc b/groups/bluetooth/ag620/init.rc
index c970e237f..07bfe1960 100644
--- a/groups/bluetooth/ag620/init.rc
+++ b/groups/bluetooth/ag620/init.rc
@@ -1,9 +1,6 @@
 on boot
     insmod ${ro.vendor.boot.moduleslocation}/btif_drv.ko
 
-on post-fs-data
-    mkdir /data/misc/dhcp 0770 dhcp system
-
 service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
     disabled
     oneshot
diff --git a/groups/bluetooth/auto/product.mk b/groups/bluetooth/auto/product.mk
index 8a1d8d6aa..6561e1a98 100644
--- a/groups/bluetooth/auto/product.mk
+++ b/groups/bluetooth/auto/product.mk
@@ -12,7 +12,7 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:vendor/etc/permissions/android.hardware.bluetooth.xml \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:vendor/etc/permissions/android.hardware.bluetooth_le.xml
 
-PRODUCT_PROPERTY_OVERRIDES += bluetooth.rfkill=1
+PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.rfkill=1
 
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0-service.vbt \
diff --git a/groups/bluetooth/autodetect/init.rc b/groups/bluetooth/autodetect/init.rc
index b4bf5b41e..96224c702 100644
--- a/groups/bluetooth/autodetect/init.rc
+++ b/groups/bluetooth/autodetect/init.rc
@@ -6,9 +6,6 @@ on boot
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps
 
-on post-fs-data
-    mkdir /data/misc/dhcp 0770 dhcp system
-
 service dhcpcd_bt-pan /system/bin/dhcpcd -d -aABKL
     disabled
     oneshot
diff --git a/groups/bluetooth/bcm43241/init.rc b/groups/bluetooth/bcm43241/init.rc
index a8d306d31..e9cf8c796 100644
--- a/groups/bluetooth/bcm43241/init.rc
+++ b/groups/bluetooth/bcm43241/init.rc
@@ -55,9 +55,6 @@ on boot
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps
 
-on post-fs-data
-    mkdir /data/misc/dhcp 0770 dhcp system
-
 on property:vendor.bluetooth.hwcfg=start
     start vendor.btcfg
 
diff --git a/groups/bluetooth/bcm43241/product.mk b/groups/bluetooth/bcm43241/product.mk
index 643bc2923..a170ffb31 100644
--- a/groups/bluetooth/bcm43241/product.mk
+++ b/groups/bluetooth/bcm43241/product.mk
@@ -17,7 +17,7 @@ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:
 
 {{^hsu}}
 PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.hwcfg=stop \
-                bluetooth.rfkill=1
+                vendor.bluetooth.rfkill=1
 
 # Bluetooth eng / userdebug
 ifneq ($(TARGET_BUILD_VARIANT),user)
diff --git a/groups/bluetooth/bcm43340/init.rc b/groups/bluetooth/bcm43340/init.rc
index 05a23e1e0..f4ea41e6f 100644
--- a/groups/bluetooth/bcm43340/init.rc
+++ b/groups/bluetooth/bcm43340/init.rc
@@ -12,9 +12,6 @@ on boot
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps
 
-on post-fs-data
-    mkdir /data/misc/dhcp 0770 dhcp system
-
 on property:vendor.bluetooth.hwcfg=start
     start vendor.btcfg
 
diff --git a/groups/bluetooth/bcm43340/product.mk b/groups/bluetooth/bcm43340/product.mk
index 6d7f1d106..69f3d81a8 100644
--- a/groups/bluetooth/bcm43340/product.mk
+++ b/groups/bluetooth/bcm43340/product.mk
@@ -7,7 +7,7 @@ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:
 		frameworks/native/data/etc/android.hardware.bluetooth_le.xml:vendor/etc/permissions/android.hardware.bluetooth_le.xml
 
 PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.hwcfg=stop \
-                bluetooth.rfkill=1
+                vendor.bluetooth.rfkill=1
 
 # Bluetooth eng / userdebug
 ifneq ($(TARGET_BUILD_VARIANT),user)
diff --git a/groups/bluetooth/bcm4339/init.rc b/groups/bluetooth/bcm4339/init.rc
index 05a23e1e0..f4ea41e6f 100644
--- a/groups/bluetooth/bcm4339/init.rc
+++ b/groups/bluetooth/bcm4339/init.rc
@@ -12,9 +12,6 @@ on boot
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps
 
-on post-fs-data
-    mkdir /data/misc/dhcp 0770 dhcp system
-
 on property:vendor.bluetooth.hwcfg=start
     start vendor.btcfg
 
diff --git a/groups/bluetooth/bcm4339/product.mk b/groups/bluetooth/bcm4339/product.mk
index f33333964..88c458973 100644
--- a/groups/bluetooth/bcm4339/product.mk
+++ b/groups/bluetooth/bcm4339/product.mk
@@ -7,7 +7,7 @@ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:
 		frameworks/native/data/etc/android.hardware.bluetooth_le.xml:vendor/etc/permissions/android.hardware.bluetooth_le.xml
 
 PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.hwcfg=stop \
-                bluetooth.rfkill=1
+                vendor.bluetooth.rfkill=1
 
 # Bluetooth eng / userdebug
 ifneq ($(TARGET_BUILD_VARIANT),user)
diff --git a/groups/bluetooth/bcm43430/init.rc b/groups/bluetooth/bcm43430/init.rc
index 05a23e1e0..f4ea41e6f 100644
--- a/groups/bluetooth/bcm43430/init.rc
+++ b/groups/bluetooth/bcm43430/init.rc
@@ -12,9 +12,6 @@ on boot
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps
 
-on post-fs-data
-    mkdir /data/misc/dhcp 0770 dhcp system
-
 on property:vendor.bluetooth.hwcfg=start
     start vendor.btcfg
 
diff --git a/groups/bluetooth/bcm43430/product.mk b/groups/bluetooth/bcm43430/product.mk
index 95a9bbddc..ca356d743 100644
--- a/groups/bluetooth/bcm43430/product.mk
+++ b/groups/bluetooth/bcm43430/product.mk
@@ -7,7 +7,7 @@ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:
 		frameworks/native/data/etc/android.hardware.bluetooth_le.xml:vendor/etc/permissions/android.hardware.bluetooth_le.xml
 
 PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.hwcfg=stop \
-                bluetooth.rfkill=1
+                vendor.bluetooth.rfkill=1
 
 # Bluetooth eng / userdebug
 ifneq ($(TARGET_BUILD_VARIANT),user)
diff --git a/groups/bluetooth/bcm4356/init.rc b/groups/bluetooth/bcm4356/init.rc
index 24f912223..885062255 100644
--- a/groups/bluetooth/bcm4356/init.rc
+++ b/groups/bluetooth/bcm4356/init.rc
@@ -55,9 +55,6 @@ on boot
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps
 
-on post-fs-data
-    mkdir /data/misc/dhcp 0770 dhcp system
-
 on property:vendor.bluetooth.hwcfg=start
     start vendor.btcfg
 
diff --git a/groups/bluetooth/bcm4356/product.mk b/groups/bluetooth/bcm4356/product.mk
index 2e1c08a2f..b52454325 100644
--- a/groups/bluetooth/bcm4356/product.mk
+++ b/groups/bluetooth/bcm4356/product.mk
@@ -16,7 +16,7 @@ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:
 
 {{^hsu}}
 PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.hwcfg=stop \
-                bluetooth.rfkill=1
+                vendor.bluetooth.rfkill=1
 
 # Bluetooth eng / userdebug
 ifneq ($(TARGET_BUILD_VARIANT),user)
diff --git a/groups/bluetooth/btusb/init.rc b/groups/bluetooth/btusb/init.rc
index 96cd3d6e1..db581fa38 100644
--- a/groups/bluetooth/btusb/init.rc
+++ b/groups/bluetooth/btusb/init.rc
@@ -16,9 +16,6 @@ on boot
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps
 
-on post-fs-data
-    mkdir /data/misc/dhcp 0770 dhcp system
-
 service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
     class main
     user bluetooth
diff --git a/groups/bluetooth/btusb/product.mk b/groups/bluetooth/btusb/product.mk
index 65e036115..27b14643f 100644
--- a/groups/bluetooth/btusb/product.mk
+++ b/groups/bluetooth/btusb/product.mk
@@ -3,7 +3,7 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:vendor/etc/permissions/android.hardware.bluetooth.xml \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:vendor/etc/permissions/android.hardware.bluetooth_le.xml
 
-PRODUCT_PROPERTY_OVERRIDES += bluetooth.rfkill=1
+PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.rfkill=1
 
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth-service.default.vbt 
diff --git a/groups/bluetooth/rtl8723bs/init.rc b/groups/bluetooth/rtl8723bs/init.rc
index d2e3c0d19..1184e9a0d 100644
--- a/groups/bluetooth/rtl8723bs/init.rc
+++ b/groups/bluetooth/rtl8723bs/init.rc
@@ -54,9 +54,6 @@ on boot
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps
 
-on post-fs-data
-    mkdir /data/misc/dhcp 0770 dhcp system
-
 on property:vendor.bluetooth.hwcfg=start
     start vendor.btcfg
 
diff --git a/groups/bluetooth/rtl8723bs/product.mk b/groups/bluetooth/rtl8723bs/product.mk
index 54f630798..eb9c516f7 100644
--- a/groups/bluetooth/rtl8723bs/product.mk
+++ b/groups/bluetooth/rtl8723bs/product.mk
@@ -23,7 +23,7 @@ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:
 
 {{^hsu}}
 PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.hwcfg=stop \
-                bluetooth.rfkill=1
+                vendor.bluetooth.rfkill=1
 
 # Bluetooth eng / userdebug
 ifneq ($(TARGET_BUILD_VARIANT),user)
diff --git a/groups/bluetooth/stonepeak/init.rc b/groups/bluetooth/stonepeak/init.rc
index 39c0968e3..ae5a5cd7b 100644
--- a/groups/bluetooth/stonepeak/init.rc
+++ b/groups/bluetooth/stonepeak/init.rc
@@ -9,9 +9,6 @@ on boot
     insmod ${ro.vendor.boot.moduleslocation}/bluetooth.ko
     insmod ${ro.vendor.boot.moduleslocation}/btusb.ko
 
-on post-fs-data
-    mkdir /data/misc/dhcp 0770 dhcp system
-
 service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
     disabled
     oneshot