[automerger skipped] Merge "Do not detect portals when DNS returns private...
[automerger skipped] Merge "Do not detect portals when DNS returns private IPs" into rvc-dev am: 6fb2a069 -s ours
am skip reason: Change-Id I51975e18f424e3b7265011000f073777f376e597 with SHA-1 4915fafd is in history
Change-Id: I5736acac9f4c93a60461ee123b83cd6466ad0328