Trebuchet: EL translation

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Ib8aef86dde781519109fa6424e656a4ba07d28c3
Merge remote branch 'cm/cm-10.1' into cm-10.1