Suppress expected exception messages in unit test

Closes-Bug: 1358120
Change-Id: Id3683d49d45c0077b93fd2241ebe11b1225c4ab2
Merge "Suppress expected exception messages in unit test"