Automatic translation import

Change-Id: I74a5f31311f95ddace9e06491b7f46420008b06c
Merge branch into kk_mkt