Merge "Fix test 1935 for JIT-at-first-use."