Merge "Fix bad wpa.c merge" into oc-dev