Merge "Apollo: FI translations" into cm-10.2