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