Automatic translation import

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