Automatic translation import

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