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

Change-Id: If5d8c67547e533b9939d3e2869071d92025cd2ee