Merge "Revert "Fail fast during advanced networking test""