Automatic translation import

Change-Id: I7fe707ff5eee73dde4f95f552489064f30a8d50f
Merge cm 'branch cm-11.0' into cm-11.0