Merge "Clean up TestCaseUtil" am: 43851d01d8 am: e38d503394
am: b5b6e7cf45

Change-Id: I98265e973df1bf7ac28b7f79f6ccd0a865762304