Merge "Fix NPE in DownloadStorageProvider."