Bug 884565 - [WiFi] Fix WPS regression by Bug 879193