Automatic translation import

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