Merge "Don't proceed with userspace reboot if device doesn't support it"
am: c9d8d2b7aa

Change-Id: I4cc84170808dc0061016ee405178975f5f075d84