Automatic translation import

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