Trebuchet: AF Translations

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