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

Change-Id: I98914bf79ad6178e1ef8689acf5d0a18c78a7735