am 93146839: am 9dc601eb: Merge "Revert "Fix deoptimization with pending exception""

* commit '93146839d83c82fc42fe3463bea5aa6e519afc2e':
  Revert "Fix deoptimization with pending exception"