Automatic translation import 

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