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

Change-Id: I5038667db6b15d74aada29e245b8ff81ca2f3bd8