Merge "Simplify Exception expressions in CSTest"
am: b1d9ad9287

Change-Id: I750e063d2d17be426fe5e578c7bc8d4cacb922a2