Merge "fs_mgr: remount: system is root"