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

Change-Id: Ifd5acffff7b45e02d5ba404550e32e16b5003bd7