Merge "Simplify Exception expressions in CSTest"
am: febb37f376

Change-Id: I547133d879f33f5eaa38f6b4df7674c4d068fe60