Merge "Revert "Simplify Exception expressions in CSTest""
am: 73b4106d7e

Change-Id: I3925edb7158594a19611ff47b3c560aed73c1a0f