Automatic translation import

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