Merge "Fix WiFi test:" into jb-mr1.1-dev