Automatic translation import

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