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

Change-Id: Idee25a2fa2009e203c1ecd378236fdfb92edd747