Update delete messages

Patchset 1) Initial patch
Patchset 2) Add change to cancel download dialog

Change-Id: I2b9617f63a2ffe710117650fcb0da14f097f2e37
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1