Merge "Fix rule of three warnings" am: dfd195160a am: 52b3fe2fcc
am: 71b953d0a3

Change-Id: I7a18515d52e3137b3fef304f6c69a6c2a7c64264