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

Change-Id: I4c50b19ae07b597ed4f8289a904e1f41ece29d29