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

Change-Id: I6e9c4e57d3fd174e92b0e5d116e7c3f6f9adbeed