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

# Via Android Git Automerger (3) and others
* commit '63d258167637309c0c85725ecc9112a88bf57824':
  Fix WiFi test: