Merge changes I4859c8db,I7643024d

* changes:
  Add the TZInfo updater and relevant intent.
  Fix ConfigUpdater for binary files.