Consolidate the wait in recovery's reboot am: e8ca1b8634 am: 32d28f90f0 am: 457bb8ce31 am: 8b43fdd100

Change-Id: I4ba85511f34432ef445b49a9d5a83ab601270537