Merge "Fix performance-for-range-copy warnings" am: 10a6a9f071
am: 6687474dc6

Change-Id: I336f0a3e6de758285d35b093a2df16d182297f9b