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

Change-Id: Ia181dc7037810e699346d7536b78f3359060f4f9