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

Change-Id: I086518982d79b295914783948e98c79f09eedd46