Merge "Cleanup test method names." am: 8e9fd295c8 am: 361412ced4 am: f41881b7fe
am: 24d5a0bae2  -s ours

Change-Id: I663efcf7cb1367be5d17b417d8c7b35012cf1ce6