Merge "Fix performance-for-range-copy warnings" am: 1ce37f1de3 am: c9584831bc
am: 538d53267b

Change-Id: I15dfaa7eb997c7caf497b488384477952513cef7