Merge change 5348

* changes:
  Add missing filename remap to RenamingDelegatingContext