Merge "Fix performance-for-range-copy warnings" am: bc29242288
am: 7adb73f332

Change-Id: I0ab1a28f5490f96bc8b08f073d364a01ff2f20df