Automatic translation import

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