am 18225508: am 49052093: Merge "Fix captive portal detection on IPv6 networks." into klp-dev

* commit '18225508dd8c9d833c1699ad17a6bba4e4a46c4f':
  Fix captive portal detection on IPv6 networks.