Automatic translation import

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