am f3ef10b1: am 2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev

# Via Android (Google) Code Review (1) and others
* commit 'f3ef10b12b61891962eb6253e95c8c9eec82d383':
  Fix WiFi test: