Merge changes I00deb50c,I82650277 into main

* changes:
  Clean up userspace-reboot (#2)
  Clean up userspace-reboot