Merge "Fix connection-determination code." into honeycomb