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

Change-Id: Icebcc3c2f221040b931b3fc0c51b8099cca2f7e0