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

Change-Id: I61a50f38c65c8386c8c38b3fac930ce0f1cdf58a