Automatic translation import

Change-Id: I30ee33f217c4da82e0e91a25ee08ed26e59fe52f
Merge branch 'cm-11.0' into kk_mkt