Merge "remount: Split fstab and checkpointing code into helper functions."