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

Change-Id: I2022ee7a3a27cda7c747d740d61cc96256ff3609