Merge "Fix off-by-one in parse3339 timezone check"