Merge "Fix interaction between JIT and instrumentation."