Merge "Fix assert failure in interpreter after deoptimization."
am: b0fca360a0

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

Change-Id: I7755c9fd6ca1ec0e5f5573115d6fbaf32d5265ed