Automatic translation import

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