Merge "Revert "refactor radioPowerState""