Merge "dumpstate: fix double close."
am: 48b34b37a6

Change-Id: I1e28a06210ea15617f1f34f91a0e041974b507f8