Merge "Fix performance-for-range-copy warnings"
am: b90b93725d

Change-Id: I336831177aa8849ec6b6a8c5f238b44de0e0bb96