Merge "Revert "Deopt does not throw""
am: cee4928036

Change-Id: I2e60d8d2c503e48c224e889d956ff914e191e2e4