Automatic translation import

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