Automatic translation import

Change-Id: If14a59490d2cabbeb685508b235769b1cf5ecd61
Merge branch into kk_mkt