Merge "Fix bogus interaction between code cache and instrumentation."
am: d0ea91213c

* commit 'd0ea91213cd821302237f620caa03d3dcfe52e4f':
  Fix bogus interaction between code cache and instrumentation.