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

Change-Id: Ibdad1604b48cd73d14c216e9835ea3bed6170e72