Automatic translation import

Change-Id: Ia405baebbd7725d156331158151dece4b5e68b27
Merge branch into kk_mkt