Trebuchet: Af Translations

Change-Id: I5cec542094476e6d4f82368ca33263276d79e9ae
Merge "Trebuchet: Af Translations" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0