Merge "Fix performance-for-range-copy warnings"
am: d01f7050ac

Change-Id: Ic1f8cdf59f47c889275cc4e0ac57dc75869735e6