Merge "Cleanup RadioOnHelper and supporting methods"