Merge "remove unnecessary code from DownloadManager"