Merge "Fix flaky tests in NetworkPolicyManagerServiceTest." into oc-dev