am b4510e3c: Merge "Fix Wifi Stress test after wifi settings are moved to...
am b4510e3c: Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global" into jb-mr1-dev
* commit 'b4510e3c':
Fix Wifi Stress test after wifi settings are moved to Settings.global