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

Change-Id: I9965667c7ce7762d567f1a59a0995324138542da