Merge "NotificationService causes watchdog issues and improves performance" am: 9e55959a am: 2f34d0ec am: 4c9a5273 Change-Id: I7ece5398612ed199b18bffec73bb9a5ba51c3fe9