Merge change 5545 into donut

* changes:
  remove updater from the user system image