Merge "Fix another off-by-one error in ZipFileRO" into klp-dev