Merge "Don't rely on the GSM 03.38 charset instance." into cm-10.2