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

* commit '49cbce3746ccc34ce803dca0ee3862e31a7efe63':
  Fix handling of suppressed exception

Change-Id: I79c1bebbe7b91349bf9cd35d58eba81ba898dd4e