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

Change-Id: If7314d5be257dc6221ef0b9222147db7b2710bb8