Automatic translation import

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