Automatic translation import

Change-Id: Iba8c294484a3633b45afa4c0e04cd7a67f0246d5
Merge remote-tracking branch 'cm/cm-11.0' into HEAD