Automatic translation import

Change-Id: Ic5f38bd49e87ef6acd86afbf51c6f7e8cf17f83d
Merge branch into kk_mkt