Merge "Fix compile errors in telephony tests"