Automatic translation import

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