Merge "Set ContactInfo.normalizedNumber to null for SIP addresses"