Merge "Fix TestNotificationService not found"