Automatic translation import

Change-Id: I7c59ab2af4e9fbe9a2b152a991a68fccb10fa1ba
Merge branch into kk_mkt