Merge "Throw IOException on multiple connects." am: 632e515468 am: ead7c0e489

Change-Id: I51690e73f8db042a7457afbcadc8003fe476b100