Automatic translation import

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