Merge "Fix NetworkPolicy tests after notifications."