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

Change-Id: I6469a1efbbb14c45bd0c6f13805bcff8d43a89ca