am acf7b5d2: am 9dabdaec: Merge "Handle user-defined cache path for RS."

* commit 'acf7b5d24a98dc97b551e205bf7638f47d9304c0':
  Handle user-defined cache path for RS.