Merge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cdb6 am: 5be9960f66
am: d544a4c682

Change-Id: I9e2ee5c872aaa500378900962899672f318e294c