Automatic translation import

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