Automatic translation import

Change-Id: I1df8ba8e0a41da4812318b55c68610945998c469
Merge branch "cm-11.0" into kylin