Merge "Make StartupService use asynchronous client"