Merge "Fix performance-for-range-copy warnings"