Framework: AF Translations

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