am ed39479f: am 7c842b57: (-s ours) am ab64465d: am 0e3ce82b: Merge "Use fsck.f2fs -a instead of -f for faster boot"

* commit 'ed39479f0c5523aa948d5d68df3fb01a1919b88b':