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

Change-Id: I12431c76e7639a204bffff2b05fc211212b766ac