Merge "Fix performance-for-range-copy warnings" am: 10a6a9f071 am: 6687474dc6
am: a5466b2ac7

Change-Id: Ic04a1ddf25643fe836cc15a59c7f61fe6b6e8f00