Merge "Merge "Add ServiceManager.registerForNotifications" am: ce80de5db0 am: 45ddf12cbc am: 3b546f86e0 am: 5c940e62c3"