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

Change-Id: Ifc0f71cf4c68989a914232483e2d53d172df96a3