Improve strings

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