Automatic translation import

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