Merge "Don't reboot into recovery during userspace reboot" am: 661c77be0f am: 0d523b28cb

Change-Id: I16510453ec326b534ef029b4d4221d0150575645