Merge "Properly fail userspace reboot if it's not supported" am: 2af5bd00b0 am: 62a02cc826

Change-Id: Ia9250cd4a4818cd71c9408e38aefcef091416180