Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global" into jb-mr1-dev