Automatic translation import

Change-Id: I31b90f35dfcd05bd9add1b64b4c511ea659cdb07
Merge branch into kk_mkt