Merge latest cm-10.2 telephony