Automatic translation import

Change-Id: I3c94548cfd1c96afcd222bbbed28dc995fce5e66
Merge branch into kk_mkt