[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

Change-Id: I359147fb152042f803c373d26ed96ba79ca55904