Merge "ServiceManager: doc comment"