Merge "Fixing DownloadManager Test app."