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

Change-Id: I0c7e50f0059fd2abb5edd9f9f9a5bb82dbb7f62c