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

Change-Id: Id6a044347e18bdca5073480d2f3f3ec51adf0086