Merge "Trigger a policy reload from post-fs-data."
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 21ae5bf..88dee10 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -245,6 +245,9 @@
     # Separate location for storing security policy files on data
     mkdir /data/security 0711 system system
 
+    # Reload policy from /data/security if present.
+    setprop selinux.reload_policy 1
+
     # If there is no fs-post-data action in the init.<device>.rc file, you
     # must uncomment this line, otherwise encrypted filesystems
     # won't work.