I really need to stop doing so many commits at once.  Fixes for slow downs in the OS and possible merging of another device's change to the radio, in an attempt to fix the radio issues we're having.

Change-Id: If112e3eee483e34696a84abfab1ba71d18c0c5f4