Merge "refactor radioPowerstate"
am: 354fc35005

Change-Id: I964beaa764a9c49b462167a9192ac03d3049d0a9