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

Change-Id: I95fb6b379f9ab5791fc1ad24fd8d399db51ced15