Automatic translation import

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