Frameworks: Refactor AF translations

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