Merge "Revert "Fix bogus interaction between code cache and instrumentation.""