Consolidate the wait in recovery's reboot am: e8ca1b8634 am: 32d28f90f0 am: 0f681a09b6

Change-Id: Id37c59c2886f1bc2d716d6ffce0ac822404fbfd6