Merge "Switch ConfigUpdater to the new version of timezone updater code"