Merge branch 'bugfix/fix_some_wifi_bug' into 'master'

Fix some wifi bugs

See merge request !1680
This commit is contained in:
Jiang Jiang Jian
2017-12-19 17:31:44 +08:00