Merge "Make remount into checkpointing for ext4 userdata a no-op" am: dbee3618be am: 770d11fa2d
am: 34914680e9

Change-Id: I5dfc9348d2e67493cc0b039e15ed05590c83790b