Automatic translation import

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