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

Change-Id: I903c27f5ae7c2c755dfd7e3e9258be5bedec8f10