Automatic translation import

Change-Id: I01941ced3f45de2c567233efd878c90b5528a3ba
Merge branch into kk_mkt