Automatic translation import

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