Merge "Temporarily @ignore test_reconnect" am: 9bfa166ad9
am: 84d796dac4

Change-Id: I6f410fd27449bd6e868cb4e467af268dac47d348