Automatic translation import

Change-Id: I7bd7a7bb8a87f741fbee89ff163f0419f2e8f9b6
Merge remote branch 'cm/cm-11.0' into cm-11.0