Merge "Fix failing reconnect test."