Merge "Correct OffloadServiceInfo Javadoc" into main