Automatic translation import

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