Merge "Fix interaction between JIT and instrumentation." am: dc18417745
am: 8aee1b147b

* commit '8aee1b147b35825c66689a8b7881a20141fcd54f':
  Fix interaction between JIT and instrumentation.