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

Change-Id: I4a051d10c07877ea4fcfa328bef18c4d346c9de1