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

Change-Id: I3e0e92907cb38b932591cfcd5a18fd4186a44719