Merge "Allow DownloadProvider to upsert already downloaded file" into rvc-dev