Merge "Telephony: Af Translations" into cm-11.0