Automatic translation import

Change-Id: I85292dc30a84d935c25654641bc17f1ed62ba178
Automatic translation import

Change-Id: Iac123891f5ce8333a72587c5debfb725219b8f7a
Merge remote-tracking branch 'cm/cm-11.0' into kk-mr2