Automatic translation import

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