diff --git a/common.mk b/common.mk
index a3c9d03e..b9e6631c 100644
--- a/common.mk
+++ b/common.mk
@@ -17,7 +17,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.vendor.extension_library=libqti-perfd-client.so \
     persist.radio.apm_sim_not_pwdn=1 \
     persist.radio.custom_ecc=1\
-    persist.radio.sib16_support=1
+    persist.radio.sib16_support=1 \
+    ro.frp.pst=/dev/block/bootdevice/by-name/config
 
 PRODUCT_PRIVATE_KEY := device/qcom/common/qcom.key
 PRODUCT_PACKAGES += qcril.db
diff --git a/common64.mk b/common64.mk
index f8523f2e..c2d57201 100644
--- a/common64.mk
+++ b/common64.mk
@@ -18,7 +18,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.vendor.extension_library=libqti-perfd-client.so \
     persist.radio.apm_sim_not_pwdn=1 \
     persist.radio.sib16_support=1 \
-    persist.radio.custom_ecc=1
+    persist.radio.custom_ecc=1 \
+    ro.frp.pst=/dev/block/bootdevice/by-name/config
 
 PRODUCT_PRIVATE_KEY := device/qcom/common/qcom.key
 
diff --git a/rootdir/etc/ueventd.qcom.rc b/rootdir/etc/ueventd.qcom.rc
index 78fef4aa..8fd2947a 100644
--- a/rootdir/etc/ueventd.qcom.rc
+++ b/rootdir/etc/ueventd.qcom.rc
@@ -236,3 +236,6 @@
 #ImproveTouch device
 /dev/hbtp_input           0660   system     system
 /dev/hbtp_vm              0660   system     system
+
+# Add device block for FRP
+/dev/block/platform/soc/7824900.sdhci/by-name/config    0600   system     system