Automatic translation import

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