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

Change-Id: I22208300562377c27f83e847513de502e69db332