Merge "Replace INetworkPolicyManager to NetworkPolicyManager"