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

# Via Android Git Automerger (4) and others
* commit 'c5401d4451dfb5edb627a35c1d3ad90cbcef77a1':
  Fix WiFi test: