Fix handling of suppressed exception am: 1247e62e91
am: 5410803f06

* commit '5410803f06de3f4512ed18eab32f7bf6421a4aa8':
  Fix handling of suppressed exception

Change-Id: If9ae1a7a9ce88b576f572e5787aca4741eda7dbb