Merge "Revert "Simplify Exception expressions in CSTest""