Merge "fs_mgr: fix clang static analyzer warning"