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

* commit 'dc184177452ed438718befccd9d984cc93de51cc':
  Fix interaction between JIT and instrumentation.