Merge "Fix DownloadProviderTests." into qt-dev
am: ab55bc1844

Change-Id: Ieb5e69d6fe5d09c8775a21901ffa0245cf2c6800