Automatic translation import

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