Merge "Fix NetworkNotificationManagerTest" am: c13a80deee am: 13f0d10115 am: 31c566037b
am: a67ea35d9a

Change-Id: I000077352ab0e1af7209a266be0309607034dbea