Automatic translation import

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