Automatic translation import

Change-Id: I5aed00839b5f59ddb717fa5954da1378cfb3f7e0
Merge branch into kk_mkt