Automatic translation import

Change-Id: I4aba1505eec856a80347065766949777f9c6b6d3
Merge branch into kk_mkt