Automatic translation import

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