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