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

Change-Id: I9737cdfceb1ba74211efc3fb7fb4d8657578cd25