Automatic translation import

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