Merge "Final API changes for IRadio"