Merge "Fix NetworkNotificationManagerTest"