Merge "Fix clang-tidy perfomrance warnings."