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

Change-Id: I0a5485ada12f09f1222593a8dbdc38a34b052884