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

Change-Id: Ie8b9050e503c30d5b2e11748e9d53c24360ea7e4