Merge "fs_mgr: code clean up"