Merge "Clean up TestCaseUtil"
am: 43851d01d8

Change-Id: I5a56102b06053eb92583457105adf7e88bdb5502