Automatic translation import

Change-Id: I0c245522a28bad717bd65ff6b9f9b6c64c4bd834
Merge branch into kk_mkt