DO NOT MERGE Network notifications: revamp keying scheme
am: 6cccb3bec3

Change-Id: Ibad7d0210b2c69826462b781f43a82d65849ebfb
tree: 3204631ec4e76ddd80eab690f62901e4d349befe
  1. core/
  2. services/
  3. tests/