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

Change-Id: I5f98df438bb7026b8c6200f484b466d05f16605d