DO NOT MERGE Network notifications: revamp keying scheme
am: 84daaea8fd

Change-Id: Ibad7d0210b2c69826462b781f43a82d65849ebfb