Automatic translation import

Change-Id: Ic9f346966eb12a416093f6989ea6ed102e60a19d
Merge branch into kk_mkt