Merge "Fixes for download manager test."