Merge "Revert recent JIT code cache changes" into oc-mr1-dev