Improve strings.

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