Automatic translation import

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