Merge "Revert "Revert "refactor radioPowerState"""