Trebuchet: Refactor AF translations

Change-Id: Idcb23e09a931b873ef23dc9692827d78ac9bd0e6
Merge remote branch 'cm/cm-10.1' into cm-10.1