Automatic translation import

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