Merge "Fix NetworkPolicyManagerServiceTest failures."