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

Change-Id: I87f387ce215e40ffca50bdcce0bd314f57e071e3