Merge "Temporarily @ignore test_reconnect"
am: 9bfa166ad9

Change-Id: I4c95ecf11b2467fc73765a5c6564865c2ee09a3e