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

Change-Id: Icaa9d8435e9915b8804979ccdeec8eb1dd6337c8