[automerger skipped] Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]"
am: 9b18b764bc  -s ours

Change-Id: I15fbe10ff91d910478dd67c93fbd9bff8f3fee36