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

* commit '3f5f8538bc8dcc83771cdcf726ef2c5db90a5668':

Change-Id: I362782c0b415a04bf63d1af942d6f3a3b0f1943c