Merge "Scheduling policy service"