Apollo: ES translations

- Short by filename

Change-Id: I106c723954edba597bbe50372634f6db0b3177ed
Merge branch 'cm-11.0' into martincz