Merge "Modify to return the ServiceState corresponding to the subId param." into main