Automatic translation import

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