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

Change-Id: I0edba8a195000170a1bb6d09b5a99d3a67ce0077