Merge "Correctly init code cache path for RS"