Merge "Unify behavior of various cases of "no underlying networks"" into pi-dev