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

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