Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API"