Automatic translation import

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