core: Improve strings

* Follow the guidelines

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