Automatic translation import

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