Trebuchet: AF translations

Change-Id: I2b6d339f1e0905d4d1ca690998326bbd8ff0cd83
Merge "Trebuchet: AF translations" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2