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

Change-Id: I2b8ebf4a2b33f754550c2865c5ac33e107feb3af