Merge "Fix NetworkPolicyManager unit tests."