Merge "Ignore testReevaluateNetwork until Q"