Merge "Regeneration of tzs2.dat after tzids.prototxt fix"