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

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