Merge "[incremental] allow service manager to find incremental_service"