Merge "Fix rule of three warnings"
am: dfd195160a

Change-Id: Ifcc0ef0c71f465ada5c62cbcccd40580df802a51