Automatic translation import

Change-Id: Iff6c175264ebcea87f28d404222757f23b5ecf5f
Merge branch into kk_mkt