Merge "Handle connection events from the original connection." into nyc-mr1-dev