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

* commit 'b4510e3c6dc645753533cd3b2e17e99de41480b4':
  Fix Wifi Stress test after wifi settings are moved to Settings.global