Merge "fastboot: Check that reboot to userspace succeeded." am: dd85c74655
am: f598e140e9

Change-Id: I13d4eff673096fc04a07433ab97e6146e65e7047