Automatic translation import

Change-Id: If61d85c7fae1ebeb1eb57f85ff27763fea19613d
Merge branch into kk_mkt