Merge "Fix startup of Network Discovery pods"