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

Original change: undetermined

Change-Id: I40f94adfd7f7ef9719d8cca9f18433a18c5547bc