Merge "Deopt does not throw" am: e7841dd294
am: a2de1270a9

Change-Id: Ia2b9d55f3d9ceb2dd59757b1f0ee69c79c827c1c