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

Change-Id: I53771e374afee33e97cdd34820ba46e1858621bf