Automatic translation import

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