Automatic translation import

Change-Id: I84d831c15b8fa4236d67123338b42d7a939a7b9f
Merge branch into kk_mkt