Apollo: EL translations

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