am 294f9860: Merge "Fix exception handling during deoptimization"

* commit '294f98602c448a49fe2192387b4065cc640e0de7':
  Fix exception handling during deoptimization