Automatic translation import

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