Merge "Implement host service manager"