Automatic translation import 

Change-Id: Ibae2a0c86cffbee943448008c0ac808f16b65006
Merge remote-tracking branch 'cm/cm-11.0' into cm11mod