Automatic translation import

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