Merge "fs_mgr: fix typo" am: e610ad619e am: 157854d564
am: cf91ff715e

Change-Id: I9cf91a52faad397dc0b4bb8bf7d5b996f1a29174