Automatic translation import

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