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

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