Merge "standardize network policy notification IDs" into oc-dev