Automatic translation import

Change-Id: Ibf0e16aa602fd87c5343cc86dfa9d8416d1e36fd
Merge branch into kk_mkt