Automatic translation import

Change-Id: I190eef2263129474f10b230d2075099a6b763ee6
Merge branch into kk_mkt