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

Change-Id: I27a0a95b375527ad10fcf2c7bd7dd7e112571db9