Merge "Broadcast Disconnecting" am: 74743602f1
am: 235dd2259c

Change-Id: Iba0560912f19a59a2facb8779e03df1d74b5c69d