Merge "Unify behavior of various cases of "no underlying networks"" into pi-dev am: 468fdc3dd2
am: d829e18d9a

Change-Id: If19b85325e7d684e645470293b3c8a674084c641