Merge "Fix DownloadManager tests." into nyc-dev