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

Change-Id: Icf9f6028bcd08d3fc1f9a3b268193ee88299471f