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

Change-Id: I160b077d4faff67a721e9557f7dae10682dc2d81