- Merge the remaining portion of the wlan-bringup branch