Merge "dumpstate: Fix IO Errors during zip writing." am: 01f59ce0f6
am: 48d93b7298

Change-Id: I503c787c5e24ac2082f387ee2fac319f722cfd94