Merge "schedule radio SAP test" into oc-dev