Automatic translation import

Change-Id: I4c2fa981875773f429ce400c4ddb2d3b193d896f
Merge branch 'cm-11.0' into kk_mkt