Automatic translation import

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