am c86e8dff: Merge "Fix WiFi stress test" into jb-mr1-dev

* commit 'c86e8dffd04804f7f975c80325bc3ae70e7e972a':
  Fix WiFi stress test