Automatic translation import

Change-Id: Ic9f6addfd94583cee7033d750e54c58abaf64d09
Merge branch into kk_mkt