Merge "Cleanup test method names." am: 8e9fd295c8 am: 361412ced4
am: f41881b7fe

Change-Id: I779562d42a399beaa8df47050d68a6fc95f47fba