Merge "Mapped IPv4 address test fix"