Merge "standardize network policy notification IDs" into oc-dev
am: ef3a28cb92

Change-Id: I0a5f11c0068a6da11bbb18d7a6f8e42f00655d74