Merge "Cold sim issue fix in telephony Provider" into nyc-dev