Merge "Fix test 1935 for JIT-at-first-use."
am: 2c3d9a443a

Change-Id: Ic3eca3be59cd496cdee9978e884c2008132492c2