Automatic translation import

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