Automatic translation import

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