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

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