Automatic translation import

Change-Id: If87ad5a690be9200f8f427a1344307e6b6cb132f
Merge branch into kk_mkt