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

* commit 'a257da82d27902fd488a09049caa5296a324a8a5':
  Fix handling of suppressed exception

Change-Id: I61c632145cb047137ac8e3516d847a8b60ebf401