Merge "[Telephony Mainline] Use new method for mainline"