Fix handling of suppressed exception am: 1247e62e91
am: a64a32c78f

* commit 'a64a32c78f39f116a15a71ad60544d900cb7353d':

Change-Id: I04121ee10bde56be0c5ca6b680595a2e5cd8ebac