Bring in toroplus radio fix from Eos 4.0

Change-Id: I1eee0f7a39d0068309f3445179c23ebd870291ac