diff --git a/BoardConfig.mk b/BoardConfig.mk
index 52735e20..8d3d1c7d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -66,7 +66,7 @@ TARGET_COPY_OUT_VENDOR := vendor
 # Install odex files into the other system image
 BOARD_USES_SYSTEM_OTHER_ODEX := true
 
-BOARD_ROOT_EXTRA_FOLDERS := persist firmware
+BOARD_ROOT_EXTRA_FOLDERS := persist firmware metadata
 
 BOARD_SEPOLICY_DIRS += device/google/wahoo/sepolicy
 
diff --git a/init.hardware.rc b/init.hardware.rc
index 1af2c56d..73d6ddd1 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -203,6 +203,9 @@ on post-fs-data
     # will fail
     restart qseecomd
 
+    # Set indication (checked by vold) that we have finished this action
+    setprop vold.post_fs_data_done 1
+
 # zygote need to be started after otapreopt which will be done on post-fs-data
 on zygote-start
     # zygote is started in common init.rc
@@ -315,10 +318,6 @@ on zygote-start
     mkdir /data/nfc/param 0770 nfc nfc
     mkdir /data/vendor/nfc 0770 nfc nfc
 
-
-    # Set indication (checked by vold) that we have finished this action
-    setprop vold.post_fs_data_done 1
-
 on early-boot
     # wait for devices
     wait_for_prop sys.qcom.devup 1
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index cdefdea4..b2f21704 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -286,3 +286,7 @@
 /persist/data(/.*)?       u:object_r:persist_data_file:s0
 /persist/display(/.*)?    u:object_r:persist_display_file:s0
 /persist/sensors(/.*)?    u:object_r:persist_sensors_file:s0
+
+/metadata                 u:object_r:rootfs:s0
+/metadata/.*              u:object_r:vold_data_file:s0
+