Automatic translation import

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