Automatic translation import

Change-Id: Iecfd60293dea60bc515e6dced8add17a713f9454
Merge branch into kk_mkt