Automatic translation import 

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