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