Merge "Fix assert failure in interpreter after deoptimization." into nyc-dev
am: d2451e48d3

* commit 'd2451e48d36cbfb9008795e3817e317e26942c7d':
  Fix assert failure in interpreter after deoptimization.

Change-Id: I68ed38812a3f47b80589fe97e602c5a75f88abb8