Automatic translation import

Change-Id: I70c6ddc75e173c244f60f100a5ff116cdc0f32a1
Merge remote-tracking branch 'CM/cm-11.0' into cm-11.0