Merge "servicemanager : Adding clear API to ServiceManager"