Automatic translation import

Change-Id: I45010224ee13cc19041b420347150f54d9a1a0ad
Merge branch into kk_mkt