Apollo: improve default translations

Change-Id: I77ddc4bd3b347707ea429542721f2c55fee3c880
Merge "Apollo: improve default translations" into cm-10.1