Automatic translation import

Change-Id: I603624f41ff9bfc1ce9987c8505203aaea2d316f
Merge branch into kk_mkt