diff --git a/conf/init.efs.16k.rc b/conf/init.efs.16k.rc
index 72ae9894..e39ac23f 100644
--- a/conf/init.efs.16k.rc
+++ b/conf/init.efs.16k.rc
@@ -6,7 +6,7 @@ service copy_efs_files_to_data /vendor/bin/copy_efs_files_to_data
     oneshot
     disabled
 
-on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=ext4
+on post-fs-data && property:ro.boot.hardware.cpu.pagesize=16384
     mkdir /data/vendor/copied 0775 radio system
     restorecon_recursive /data/vendor/copied
     exec_start copy_efs_files_to_data
@@ -15,13 +15,10 @@ on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=ex
     restorecon_recursive /data/vendor/ss
     setprop ro.vendor.persist.status mounted
 
-on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=f2fs
-    mount_all /vendor/etc/fstab.efs
-    mount_all /vendor/etc/fstab.persist
+on early-init && property:ro.boot.hardware.cpu.pagesize=4096
+    mount_all /vendor/etc/fstab.persist --early
     setprop ro.vendor.persist.status mounted
 
-on post-fs-data && property:ro.boot.flash.locked=1
-    mount_all /vendor/etc/fstab.efs
-    mount_all /vendor/etc/fstab.persist
-    setprop ro.vendor.persist.status mounted
+on late-fs && property:ro.boot.hardware.cpu.pagesize=4096
+    mount_all /vendor/etc/fstab.efs --early
 
diff --git a/conf/init.efs.4k.rc b/conf/init.efs.4k.rc
index 506c7220..8b48bdfb 100644
--- a/conf/init.efs.4k.rc
+++ b/conf/init.efs.4k.rc
@@ -1,4 +1,6 @@
-on post-fs-data
-    mount_all /vendor/etc/fstab.efs
-    mount_all /vendor/etc/fstab.persist
+on early-init
+    mount_all /vendor/etc/fstab.persist --early
     setprop ro.vendor.persist.status mounted
+
+on late-fs
+    mount_all /vendor/etc/fstab.efs --early
diff --git a/conf/init.persist.rc b/conf/init.persist.rc
index 7852c78e..4a4c3ff3 100644
--- a/conf/init.persist.rc
+++ b/conf/init.persist.rc
@@ -31,6 +31,7 @@ on property:ro.vendor.persist.status=mounted
     mkdir /mnt/vendor/persist/data/tz 0700 system system
     mkdir /mnt/vendor/persist/touch 0770 system system
 
+on property:ro.fstype.data=* && property:ro.vendor.persist.status=mounted
     # Proxy for Secure Storage
     mkdir /data/vendor/rebootescrow 0770 hsm hsm
     mkdir /data/vendor/ss 0770 root system
diff --git a/device.mk b/device.mk
index 8919f8ec..f2fa13ce 100644
--- a/device.mk
+++ b/device.mk
@@ -26,6 +26,7 @@ include device/google/gs-common/storage/storage.mk
 include device/google/gs-common/thermal/dump/thermal.mk
 include device/google/gs-common/thermal/thermal_hal/device.mk
 include device/google/gs-common/performance/perf.mk
+include device/google/gs-common/power/power.mk
 include device/google/gs-common/pixel_metrics/pixel_metrics.mk
 include device/google/gs-common/soc/freq.mk
 include device/google/gs-common/gps/dump/log.mk