Automatic translation import

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