Merge "Revert "refactor radioPowerstate""