Automatic translation import

Change-Id: Ic648ba318ea70c01c45f774fb4b5446f3438258d
Merge branch into kk_mkt