Automatic translation import

Change-Id: I914dbfad535e03b225df5ccdfa60e09a8a3cd3c3
Merge branch into kk_mkt