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

# Via Android (Google) Code Review (1) and Xia Wang (1)
* commit '2297d1e78cc70d4e19d9e7c66d24fc494455166c':
  Fix WiFi test: