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

Change-Id: Id7c546efc15e233be2bb299936647fa31cb15a73