Automatic translation import

Change-Id: I7ee8c54eb7df1a30c8729985d1beba456a145561
Merge branch into kk_mkt