Automatic translation import

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