Automatic translation import

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