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

Change-Id: I96e7ca53f2878fd9f75ac14999a02a96a96bb93e