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

Change-Id: If0a6e45f1aee111de0f0f9eee8ed310c2ef47225