Merge "Telephony: Fix cb sms implementation"