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

Change-Id: I910366ad3593e28a103db0c51d42be5f682ac21a