This fix removes code duplication and consolidates networkIsRemoved into one place. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> (cherry picked from commit 28b7824caa9c8f1acc0471136a8a4fd80e51f491) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: dd20556e037b262473f3f8163dfc7c21e9161c8e Component: engine