Merge "Handle the invalid timestamp in zipfile"