Automatic translation import

Change-Id: I49f70d8488268f3face755b75b9c64c07d666a65
Merge branch into kk_mkt