Merge "Fix Wifi test" into jb-dev