Automatic translation import

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