Merge "zip_archive: validate data descriptor contents."