Merge "Correctly init code cache path for RS"
am: 60fa615

* commit '60fa615cfc035fee38fe0a19de303457246e0b1f':
  Correctly init code cache path for RS