Automatic translation import

Change-Id: I56c76c398bb603c99f6bafc8c219e335696ce573
Merge branch into kk_mkt