Merge "Add more logging to fs_mgr_remount_userdata_into_checkpoint" am: 860e8682e2 am: 45778d2773

Change-Id: Iea0dbc073dd9362c38e6e46c6e40dde7bb077f0c