Merge "Remove IntDef annotations from NetworkPolicyManager" into sc-dev