Merge "Modify native stack calls for in-band ringing"