Merge "Fix performance-for-range-copy warnings" am: d01f7050ac
am: 51e835ce22

Change-Id: I1b0a9bf419cb3a4df2aacc3b37bf28e42fa2a103