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

Change-Id: I153c9732d7fd1733f196b9807d99cfe59fcde012