Automatic translation import

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