Merge "Small test clean up." am: 8ca50401f5
am: b523a6a616

Change-Id: I7ab907d9b743874d7e6e76b56ee02a35ee7e65bb