Consolidate the wait in recovery's reboot am: e8ca1b8634 am: 8da7e4e502

Change-Id: I05cfa15697b62e472622246ffd24b2916cbdf1e8