[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: d0cbca7e -s ours
am skip reason: Change-Id I51975e18f424e3b7265011000f073777f376e597 with SHA-1 75e9d901 is in history
Change-Id: I786c0449a9faf753b781e3be994c58df62d9e89c