Merge "Handle connection events from the original connection." into nyc-mr1-dev am: af800023cb
am: 4f22083987

Change-Id: I9e05c96c63f213bf19d0f38f7b12761a7ce948d3