Merge "Fix crash in telephony tests"