Handle connection events from the original connection.
am: d6f8931276

Change-Id: Icea396fb244e439959c9eba8fb07359d79719c12