Merge "Split IntelligenceManager / IntelligenceService."