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

Change-Id: I143ea8b6ad519e2ce3e404cf7a8a95fb3eb4d08f