Merge "Revert "Revert^2: Deopt does not throw""
am: 9d4633373d

Change-Id: I53bc330298d1fc81a276b2d492db544e4b5440ba