Automatic translation import

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