Automatic translation import

Change-Id: I4e592a71125dd3f7117ebb6c765344cb5b03edc1
Automatic translation import

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