Merge "Wait for keymasters to start up." into pi-dev
diff --git a/init.hardware.rc b/init.hardware.rc
index 97c3675..a8930db 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -873,11 +873,13 @@
     setprop persist.nfc.uicc_enabled true
 on property:ro.boot.hardware.sku=G013B
     setprop persist.nfc.uicc_enabled false
+    setprop persist.vendor.radio.uicc_se_enabled false
     interface_start android.hardware.secure_element@1.0::ISecureElement/eSE1
 on property:ro.boot.hardware.sku=G013C
     setprop persist.nfc.uicc_enabled true
 on property:ro.boot.hardware.sku=G013D
     setprop persist.nfc.uicc_enabled false
+    setprop persist.vendor.radio.uicc_se_enabled false
     interface_start android.hardware.secure_element@1.0::ISecureElement/eSE1
 
 # charger driver exposes now finer grain control, map demo mode to those properties