Automatic translation import

Change-Id: I5db0f9ee033b059838ffcabcb5e3360c8af33b91
Merge branch into kk_mkt