Fix issue where hiding copy constructor deletes move constructor. am: 3b12e5e65b
am: 996578be59

Change-Id: Ic1c7017503466cdb1df0ab77080823232804240f