Automatic translation import

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