Merge "schedule radio SAP test" into oc-dev am: b67a17c488
am: 640692b25e

Change-Id: If0756baa98508d6175553bc82bb576f8336996a5