Automatic translation import

Change-Id: I902d7b2e42abc4f90b57fef587f87c11c0704189
Merge branch into kk_mkt