AriesParts: ES translations

Patch Set 5: bypass Cid

Change-Id: I0c91b1304de87f7641853c9284288fd79bcb8aad
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1