Merge "Move host 'get-state' service up so that it works."