Reviewed-by: darcy, ohair, sherman

Reviewed-by: darcy, weijun

Summary: Don't compare with hard-coded 32-bit -1 when checking zip fields.
Reviewed-by: ksrini