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

Change-Id: I62a80b405d05ec7b4da050bd6b01df4c965d6187