Merge "Fix performance-for-range-copy warnings"
am: 1ce37f1de3

Change-Id: I2533348ccc3b11a30c95ddd84425f9ad486b232f