Fix performance-for-range-copy warnings am: 676b4245bd
am: 89e9d6e25c

Change-Id: I84863636893645049c37f327d3cc5081cbf46990