Merge "fs_mgr_remount: fix a typo" am: 43f49694a5
am: d9516f42dc

Change-Id: If45540ceff4fbcb127679cca45ccc4d032f130e3