Merge "Adds API test coverage for OffloadServiceInfo" into main