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

* commit '3a270d228d44d1bdb47e8c2d0d9b87ed838053f9':
  Fix exception handling during deoptimization