Merge "Unit tests for NetworkNotificationManager"