Automatic translation import

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