DO NOT MERGE Network notifications: revamp keying scheme am: 84daaea8fd
am: 7f907b0341  -s ours

Change-Id: Id9b2466b97aa706a57434520ffcec78140563e1c