Arm state changes
Merge branch 'master' of https://github.com/gkahn13/bsp