Merge "Fix incompatible class change error for JIT stress mode"