Automatic translation import

Change-Id: I6417bcc9e9d07451ecff117abc96fc5720d135b0
Merge branch into kk_mkt