Merge "Fix invoke-virtual not throwing ICCE in some cases"