Merge "move network notification IDs to central registry" into oc-dev am: fb54aee325
am: af2a16bfb0

Change-Id: I3400b06758615aa82e2a87cd4140b91aa9ec853b