am 3613c2a3: Merge "Fix deoptimization bugs" into lmp-mr1-dev

* commit '3613c2a336fad671363656e8d16ea981609ff02d':
  Fix deoptimization bugs