Merge "dumpstate: close socket after accepting" am: 56a8c96e1f am: cf141766bc
am: 475d217e19

Change-Id: Ib80de0ffae5c1c9e8d8283ccaba1af23f401f0d9