Merge "Clean up comment about dual-stack case handling"