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

Change-Id: I4f7399e1e5f3983e8742a987d9377fcfac8d2245