Apollo: AF Tranlations

Change-Id: Ic05522620b0141d4ff1fb597aa7e6e630e459625
Merge "Apollo: AF Tranlations" into cm-11.0