Merge "Simplify Exception expressions in CSTest" am: 064034f7c1
am: 8e3bf0f8e3

Change-Id: I32182775bf36918438868c5b77d8d1aa995c788a
tree: 1b9cd06bc30eb36d43239db3f1aa105a7ba0fae8
  1. core/
  2. services/
  3. tests/