Automatic translation import

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