Merge "Use std::move() to prevent copying."
am: 2472a523ad

Change-Id: I44846635e2e7accae383f2b1ee1e874e46a49b9d