Merge "Minor changes on IntelligenceManager APIs."