Automatic translation import

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