Merge "fs_mgr: fix space instead of tab in code"