Merge "[Wi-Fi] Fix failed test cases"