Automatic translation import

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