Merge "Change tzdatacheck to avoid hardcoding"