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

Change-Id: Ifb1f4de41d86705fe947f1c76feb47d51ae77927