Merge "wifi(implementation): Fix unit test failures"