Merge "Use a typesafe pattern for SIP Delegate configurations"