Merge "Fix clang-tidy performance warnings in fs_mgr."