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

Change-Id: I76fc8be66f17ad21bf777b7163b1013e5efe7018