Merge "Fix case where empty numbers are shown as Voicemail." into udc-dev