am 2add675f: Merge "Mapped IPv4 address test fix"

* commit '2add675fc2b3fc25c8a6be5e7f6c6c51db44cd72':
  Mapped IPv4 address test fix