Merge "Fix clang-tidy performance warnings in metricsd/uploader."