Merge "Frameworks : move custom strings to cm_strings.xml" into cm-10.1