Remove cm_strings and merge changes to strings

Change-Id: Id72a2dde64a4a0fba264eac1cbbc297ea19dadd2
Fix conflicts with privacy guard

Change-Id: I4e13746ac1836622de164d038437214557ebaeb4