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

Change-Id: I353311e56cc011b39fce433b6fb618ca92eb165c