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

Change-Id: I9429b05b34b5874170daf7b3cf66d56053aaf8fc