Merge branch 'cm-11.0' into martincz
Telephony: update translations

Change-Id: I72cc092c2494ac798098493a95b3d6c44ec808f0
Merge branch 'cm-11.0' into martincz
Merge remote-tracking branch 'mokee/kk_mkt' into cm11mod