Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev

* changes:
  DO NOT MERGE Network notifications: revamp keying scheme
  DO NOT MERGE Define Network notification proto constants.
  DO NOT MERGE Unit tests for NetworkNotificationManager