Automatic translation import

Change-Id: I9140bf4f116d6424c461b8f89c647b246e3b014f
Merge branch into kk_mkt