Merge "Implement cancelDownload and remove appName" am: 9b43ffcf2f
am: 4b1acf4421

Change-Id: Ic6d19500c335bc40e6d14d009d4d459bf02b06e1