Merge "Revert "Revert "refactor radioPowerstate"""