Merge "NotificationService causes watchdog issues and improves performance" am: 9e55959a8a am: 2f34d0ec1b

Change-Id: Iec23886357b1262b2f53ab38c1fe397ac0be4fa3