Put all notification services in one place

Change-Id: I865a2cea5e25d59fc1a78041878bc48c3bf024be