Fix handling of suppressed exception am: 74e66b8013 am: a257da82d2
am: 0f710c5d3c

* commit '0f710c5d3c592f61b0ed77ff071d57df318f1930':
  Fix handling of suppressed exception

Change-Id: I4b4aef29ab5156b06932c85dca1e22f33b76ee7f