Apollo: Fix for Transifex

Change-Id: I985df810a125bd5691ad3cad99aa08578765e95c
Merge branch "cm-11.0" into kylin