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

Change-Id: I838742b5013ab3b45f1ecace69b5a3c2e4d61bd5