Automatic translation import

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