Move some strings into cm_strings

Change-Id: I675dc206a6477fccbe70a664a7f42cd4683e0cb3