Merge "dumpstate: close socket after accepting"
am: 56a8c96e1f

Change-Id: I381f8beaa53083507ed19a70f6cc4280cc6a0aa5