Fix performance-for-range-copy warnings am: e86755279b am: e08b156730
am: ebc9a0bd61

Change-Id: I1f9617c8fd7026848f066f61535bcbad874dcdff