Automatic translation import

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