Automatic translation import

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