Merge "Fix performance-for-range-copy warnings" am: 6df27abdd0 am: 1acbe4ef90
am: 6986f176da

Change-Id: Id76466c334fd79a233d4b8af0b250354d7708503