Merge "Cleanup RadioOnHelper and supporting methods" am: 8569cd35da  -s ours am: b933fd4059  -s ours
am: a8294caf01  -s ours

Change-Id: I246225d0b7d80127a8fb43152ecf4c5e29f71b15