Automatic translation import

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