Automatic translation import

Change-Id: I8553aa668fd3380665c130a029d785a5ed9c134d
Merge branch into kk_mkt