Merge "fs_mgr_remount: fix a typo" into qt-dev
am: 482ea4a611

Change-Id: I2e00ecececc1c8d3cfa08e9f0cc1e2eb08a513be