Merge "Fix clang-tidy performance warnings."