Merge "Fix up handling of null fields in DownloadManager." into gingerbread