Automatic translation import

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