Automatic translation import

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