Automatic translation import

Change-Id: I78112f39c64248587c5a385a0b6b0bf64e276630
Merge branch into kk_mkt