Merge "telephony: Fix CID when CID is unknown"