Merge "Fix wifi association tests" into lmp-dev