Merge "Fix urn compare in EmergencyNumber"