Merge "Remove NetworkPolicyManager listener." into sc-dev