Merge "Broadcast Disconnecting"
am: 74743602f1

Change-Id: I0c53964925d4d7366daa5f7c34f53d18f385396e