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

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