cm_string.xmlFixes

Change-Id: If79002864a0a5e3e0e9c5d74ecacd9589410d50e