Merge "Fix wifi reconnection tests." into lmp-mr1-dev