Merge "Fix performance-for-range-copy warnings" am: fe3becb56b
am: e3092f6eea

Change-Id: I8675876b6b3c54c4fe02506feaea7aeb862eacd2