am c4d507da: am d71c89f4: Merge "Update instrumentation stack after exception event"

* commit 'c4d507da213bd23e91b4aeaa84e6f2d4fe599c7f':
  Update instrumentation stack after exception event