diff --git a/rootdir/init.rc b/rootdir/init.rc
index 9fe1b4f1f..436465afe 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -265,6 +265,7 @@ on post-fs-data
     chmod 0660 /data/misc/wifi/wpa_supplicant.conf
     mkdir /data/local 0751 root root
     mkdir /data/misc/media 0700 media media
+    mkdir /data/misc/vold 0700 root root
 
     # For security reasons, /data/local/tmp should always be empty.
     # Do not place files or directories in /data/local/tmp
@@ -314,6 +315,9 @@ on post-fs-data
     mkdir /data/system/heapdump 0700 system system
     mkdir /data/user 0711 system system
 
+    # Set up the crypto policies on /data/user
+    exec -- /system/bin/vdc cryptfs setusercryptopolicies /data/user
+
     # Reload policy from /data/security if present.
     setprop selinux.reload_policy 1