Merge "Fix module errors in telephony unit tests"