Merge "Add a skeleton of userspace reboot" am: f1933c910d am: 5e0e30db92
am: 438d399f98

Change-Id: I25ab7276c97caa8738ad03122ee909052a9f9736