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

Change-Id: I05814ffe8fb4ca2f334d6c0ecd772295bc2c7c63