Merge "Use std::move to avoid unnecessary copying"
am: 4ec5d33e30

Change-Id: Ib3f012c7799ef5762499e0b850b39576c7a8909f