Merge "Update connected clients when a downstream disappears." am: 22e8c3350b

Change-Id: I843d779e447f05611f1dd0d8cb57e016398f0f67