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

Change-Id: I194063f661cac876931f87abe2d4ee635d58cb8f