Merge "Simplify Exception expressions in CSTest" am: febb37f376 am: cb5aa75dd9
am: ba3ba4b915

Change-Id: I91ffbbb031d9ff6f36c51bc567ac6ce22386d07c