Merge "[Telephony Mainline] Use new method for mainline" am: cb04f43c9c am: 10f77eff19

Change-Id: Ie7c5c5026f758bef5ec0279261ea533f13921c6e