Merge change 8567

* changes:
  Add getCacheDir() to RenamingDelegatingContext.