Merge "Revert^2: Deopt does not throw"
am: a90cc8715f

Change-Id: Ie251a91a6ce167d10bf3534f8e3f6de5433ddefb