Automatic translation import

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