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

Change-Id: I51302ec5bbe83a77da8f679a07c03432e70a67fd