am 55833709: am c52e54c4: Merge "Some more test cleanup."

* commit '55833709ab4b8e6f85d19be0a5b1a096277a2dc2':