Merge "refactor radioPowerState" am: 098fe99f4c
am: 165c8ccfcd

Change-Id: Id5d54bd1a3adc0d9bf3884589a2617b76e8b5f25