Automatic translation import

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