diff --git a/private/vold_prepare_subdirs.te b/private/vold_prepare_subdirs.te
index 89b152803c5141d8a3f6f87c0ee198c35bf1e23e..4e89d6488c3c3be8cce75bbc3f7069ab4995b71c 100644
--- a/private/vold_prepare_subdirs.te
+++ b/private/vold_prepare_subdirs.te
@@ -13,8 +13,12 @@ allow vold_prepare_subdirs {
   system_data_file
   vendor_data_file
 }:dir { open read write add_name remove_name rmdir relabelfrom };
-allow vold_prepare_subdirs system_data_file:file { getattr unlink };
-allow vold_prepare_subdirs vold_data_file:dir { create open read write search getattr setattr remove_name rmdir relabelto };
-allow vold_prepare_subdirs vold_data_file:file { getattr unlink };
-allow vold_prepare_subdirs storaged_data_file:dir { create_dir_perms relabelto };
-allow vold_prepare_subdirs storaged_data_file:file getattr;
+allow vold_prepare_subdirs {
+    storaged_data_file
+    vold_data_file
+}:dir { create_dir_perms relabelto };
+allow vold_prepare_subdirs {
+    storaged_data_file
+    system_data_file
+    vold_data_file
+}:file { getattr unlink };