Automatic translation import

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