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

Change-Id: Ida04623162f7e426a00ebf3135ccda5ca6d0bf7a