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

Change-Id: I44750b4da506530dfa2bb593b334a855524413cf