Merge "Merge "Fix performance-for-range-copy warnings" am: bc29242288 am: 7adb73f332 am: 2296036a40"