Improve strings

Change-Id: Ia210ee0fb04214325d26abaefed188d956e96c91
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0