Merge "Update connected clients when a downstream disappears." am: 22e8c3350b am: bd69be52b1 am: b989c19abf am: 5572992eff

Change-Id: If58d19247c2443a7bed868d18bb83d9a60256c6c