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

Change-Id: I648c83edac2d907fa5ad82a324a470e26ccd5729