Merge "Deopt does not throw"
am: e7841dd294

Change-Id: I7850f1ed9e85d2a4ba59598612b5e18d9a3804a1