Automatic translation import

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