Automatic translation import

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