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

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