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

Change-Id: Ie4d4b3970b20625b61bfd3c47d7b37eac207e3c0