Automatic translation import

Change-Id: Iaada5275f3a48cbf82c81cc82ffb55164a53d368
Merge branch into kk_mkt