Merge "[Feature Sync] Remove expired service"