Automatic translation import

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