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

* commit 'f27b4193e37af4dbe983618f5a07473b7d70ccee':
  Mapped IPv4 address test fix