Merge "Fix WiFi stress test" into jb-mr1-dev