Merge "IMS-VT: Use original dialed string instead of normalized dial string" into nyc-dev