Merge "Consolidate the wait in recovery's reboot" am: a69c69b26f

Change-Id: I62b55862a49b460a734d0d1d4e5d46a572fb0abb