Chnage back branches and add downloadprovider

Change-Id: I5e268a49657f11f8b0fc7912b0359f9b8622afaa