Improve delete handling strings.

Change-Id: I5e9d6ab5a805b9968fcb8ed2453061de51cd9a69
Merge branch 'cm-11.0' into kk_mkt