Merge "Add Updater class and remove UpdaterInfo"