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

Change-Id: Ie1ce6c4e3f89aaec185947473cdd437fb5d2cb63