Merge "Merge "Add ServiceManager.registerForNotifications" am: ce80de5d am: 45ddf12c am: 3b546f86 am: 5c940e62"