Automatic translation import 

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