Automatic translation import

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