Merge "Fix performance-for-range-copy warnings" am: db2e4888f8 am: 947f8ee063
am: 535cd61e63

Change-Id: Ic8ee8523a644b283ef0c9592bb66bf09ca541485