Merge "Fix performance-for-range-copy warnings" am: 6df27abdd0
am: 1acbe4ef90

Change-Id: I5db341f5ba21b0127e3bcbf73e41e0bd9c15fa23