only append zip+4 if it exists

Change-Id: I64da22dba740c8a951f187e51b1f9910b8fc08b0
Merge "only append zip+4 if it exists"