Merge "Make connection / disconnect failure more robust." into honeycomb