Automatic translation import 

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