Merge "Add logging and disconnect reason for null connections."
am: 7661e81f85

Change-Id: Id1f754f62869c38499f30d6ee33046c89024efc6