Move some strings into cm_strings

Change-Id: I675dc206a6477fccbe70a664a7f42cd4683e0cb3
Merge "Move some strings into cm_strings" into cm-10.2

Change-Id: I05f4f0c8433e0b5bf3354824fa15138cb5576660