Automatic translation import

Change-Id: I82e4f38290b58a5cc4c84e8fd98e8e5483761bbe
Merge branch into kk_mkt