Automatic translation import

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