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

Change-Id: Ie68bef370f1ef2ef0ca72cd56e238fa78739e417