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

Change-Id: I57395d052d284ca3b8071b71dc762c1147d1107a