Merge "Fix clang-tidy performance warnings in frameworks/base."