Automatic translation import

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