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

Change-Id: If03e884a4b923482e7b9c626bf3388413a26075a