Merge "Implement cancelDownload and remove appName"
am: 4cd944d4b0

Change-Id: Ie7ca1088e609cc512ad0939baa14470267170b0d