Merge "refactor radioPowerState"
am: 098fe99f4c

Change-Id: Iceb1f6ebfd5bf449407ba4b9481d99db69717e90