Merge "TZ updates: Allow versions/revisions to start at 0"