Automatic translation import

Change-Id: Id6c0958b4444adc3a39c86128bf608c169de3a57
Merge remote branch 'cm/cm-11.0' into cm-11.0